Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Sat, 4 Feb 2012 21:42:19 +0000 (16:42 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 Feb 2012 21:42:19 +0000 (16:42 -0500)
Conflicts:
drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

1  2 
drivers/net/can/flexcan.c
drivers/net/can/pch_can.c
drivers/net/can/ti_hecc.c

Simple merge
Simple merge
Simple merge