]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7ce8a5 d6e640f)
Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 18:13:26 +0000 (11:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 18:13:26 +0000 (11:13 -0700)
1  2 
Documentation/networking/can.txt patch | diff1 | diff2 | blob | history
drivers/net/can/flexcan.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/networking/can.txt
Simple merge
diff --cc drivers/net/can/flexcan.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.