]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb092c0 40e0c4f)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 11 Mar 2012 22:36:34 +0000 (15:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Mar 2012 22:36:34 +0000 (15:36 -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.