David S. Miller d07d4c239b Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next ...

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

2012-02-04 16:42:19 -05: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: Fix indirect access deadlock on ISA cards

2012-02-03 00:25:06 +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

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

2012-02-04 16:42:19 -05:00

softing

net/can: convert drivers/net/can/* to use module_platform_driver()

2011-11-29 00:25:05 -05:00

usb

can: replace the dev_dbg/info/err/... with the new netdev_xxx macros

2012-02-03 01:21:26 +01: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: replace the dev_dbg/info/err/... with the new netdev_xxx macros

2012-02-03 01:21:26 +01: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

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

2012-02-04 16:42:19 -05:00

slcan.c

drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages

2012-01-31 16:20:21 -05: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