]> 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: 03746b0 af20b71)
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 18 Apr 2011 00:37:29 +0000 (17:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Apr 2011 00:37:29 +0000 (17:37 -0700)
1  2 
net/batman-adv/soft-interface.c patch | diff1 | diff2 | blob | history

diff --cc net/batman-adv/soft-interface.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.