]> 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)
commita378eba6b6041cbf0d2811f694a614b70cd4d409
tree969df78fbbc76b9ff1289e154b641a06f983569b
parente93c0c8ed7575fda0eb9f6a8825e52ae9d144e19
parentb66452550a67729d14015f748323fe5a1ded10a2
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