projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd48dc3 aabdfd6)
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)
commitd07d4c239bbf428db5581ccd5ca3770bbd15bfbd
tree969df78fbbc76b9ff1289e154b641a06f983569btree | snapshot
parentdd48dc34fe7639a8b2e22d8b609672f5f81aa7cbcommit | diff
parentaabdfd6adb804d0aaba0188ade0f1afe42a52e31commit | diff
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 diff1 | diff2 | blob | history
drivers/net/can/pch_can.c diff1 | diff2 | blob | history
drivers/net/can/ti_hecc.c diff1 | diff2 | blob | history
John Crispins staging tree