git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bd512f 8f3ea33)
Merge branch 'master' of ../net-2.6/
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Mar 2008 05:54:03 +0000 (22:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Mar 2008 05:54:03 +0000 (22:54 -0700)
Conflicts:

net/ipv6/ndisc.c


Trivial merge
Pandora Kernel Repository