]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite0a562861a9357a5691b6fb3468c5f4049051ac3
tree969df78fbbc76b9ff1289e154b641a06f983569b
parent6b49693d0e21d8ec6fe2e359219e6cc71c081199
parentb648a85509b8f5f02b57c05dac84837b7eccacbc
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.
drivers/net/can/flexcan.c
drivers/net/can/pch_can.c
drivers/net/can/ti_hecc.c