summaryrefslogtreecommitdiff
path: root/drivers/net/can/sja1000/peak_pci.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 13:40:41 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-27 13:40:49 +0000
commit96a3eab338c01e172745b1686c51c1be96ce9ead (patch)
tree5a53947a192549d9edf63550258e1bddf6f1d794 /drivers/net/can/sja1000/peak_pci.c
parentb01ee53dda8bd81855b7cda0dfb7f27d1524d87f (diff)
parenta5a928c51f807262a13e6e3412e0e1324f6b7aeb (diff)
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
* 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits) ARM: Remove redundant ';' from avic_irq_set_priority() ARM: mx3: Let mx31 and mx35 share the same CCM header file ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's Update to v3.3-rc3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/can/sja1000/peak_pci.c')
0 files changed, 0 insertions, 0 deletions