git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 761743e 0dcd505)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 19:14:10 +0000 (15:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Aug 2012 19:14:18 +0000 (15:14 -0400)
Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.

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

Trivial merge
Pandora Kernel Repository