projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b9c413 43676ab)
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 20 Jun 2011 19:59:37 +0000 (12:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Jun 2011 19:59:37 +0000 (12:59 -0700)
1  2 
net/batman-adv/hard-interface.c patch | diff1 | diff2 | blob | history

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