git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8083f0f 3ee72ca)
Merge branch 'master' of github.com:davem330/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Oct 2011 17:38:43 +0000 (13:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Oct 2011 17:38:43 +0000 (13:38 -0400)
Conflicts:
net/batman-adv/soft-interface.c


Trivial merge
Pandora Kernel Repository