linux/drivers/net/can
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
c_can net/can: convert drivers/net/can/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
cc770 can: cc770: linux/can/dev.h included twice 2012-03-03 17:40:32 +01:00
mscan can: replace the dev_dbg/info/err/... with the new netdev_xxx macros 2012-02-03 01:21:26 +01:00
sja1000 net/can: use module_pci_driver 2012-04-16 21:08:18 +02:00
softing net/can: convert drivers/net/can/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
usb can: usb: PCAN-USB Pro: fix mem leaks in pcan_usb_pro_init() on error paths 2012-04-16 21:34:50 +02:00
at91_can.c net/can: convert drivers/net/can/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
bfin_can.c can: replace the dev_dbg/info/err/... with the new netdev_xxx macros 2012-02-03 01:21:26 +01:00
dev.c can: Stop using NLA_PUT*(). 2012-04-02 04:33:42 -04:00
flexcan.c Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next 2012-02-04 16:42:19 -05:00
janz-ican3.c net/can: convert drivers/net/can/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
Kconfig can: Kconfig: add more information about Intel EG20T PCH CAN controller 2012-02-03 01:21:26 +01:00
Makefile can: cc770: add driver core for the Bosch CC770 and Intel AN82527 2011-12-01 13:09:31 -05:00
mcp251x.c can: replace the dev_dbg/info/err/... with the new netdev_xxx macros 2012-02-03 01:21:26 +01:00
pch_can.c net/can: use module_pci_driver 2012-04-16 21:08:18 +02:00
slcan.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ti_hecc.c Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next 2012-02-04 16:42:19 -05:00
vcan.c module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00