projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

1  2 
drivers/net/can/flexcan.c patch | diff1 | diff2 | blob | history
drivers/net/can/pch_can.c patch | diff1 | diff2 | blob | history
drivers/net/can/ti_hecc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/can/flexcan.c
Simple merge
diff --cc drivers/net/can/pch_can.c
Simple merge
diff --cc drivers/net/can/ti_hecc.c
Simple merge
John Crispins staging tree