]> 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: 5bd4973 7c64fd9)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 28 Feb 2012 20:07:52 +0000 (15:07 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Feb 2012 20:07:52 +0000 (15:07 -0500)
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.