git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42ae66c e8803b6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 16 Jun 2012 08:23:04 +0000 (01:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 16 Jun 2012 08:23:04 +0000 (01:23 -0700)
Conflicts:
net/ipv6/route.c

Pull in 'net' again to get the revert of Thomas's change
which introduced regressions.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge
Pandora Kernel Repository