]> 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: 6b28ff3 091b948)
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:24:56 +0000 (13:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:24:56 +0000 (13:24 -0800)
1  2 
net/batman-adv/vis.c patch | diff1 | diff2 | blob | history

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