projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17f3609) | patch
sections: fix section conflicts in net/can
authorAndi Kleen <[email protected]>
Fri, 5 Oct 2012 00:12:08 +0000 (17:12 -0700)
committerLinus Torvalds <[email protected]>
Fri, 5 Oct 2012 18:04:45 +0000 (03:04 +0900)
commit6299b669b1340b9f7de2bc2bd565921a1494e7f7
treed5b2dccaf8bee86fc88594df60aafd6e2cf65014tree | snapshot
parent17f3609c21706b377ad80b5251558ed700c2af17commit | diff
sections: fix section conflicts in net/can

Signed-off-by: Andi Kleen <[email protected]>
Cc: Oliver Hartkopp <[email protected]>
Cc: David Miller <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
net/can/af_can.c diff | blob | history
net/can/bcm.c diff | blob | history
net/can/gw.c diff | blob | history
net/can/raw.c diff | blob | history
John Crispins staging tree