Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Feb 2010 19:15:13 +0000 (11:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Feb 2010 19:15:13 +0000 (11:15 -0800)
commit749f621e20ab0db35a15ff730088922603c809ba
tree2684d12199b58f2b9e0c5b7e6cc0ea3f002e611a
parent339c6e99853d2ef1f02ad8a313e079050a300427
parent3e5e524ffb5fcf2447eb5dd9f8e54ad22dd9baa7
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6
net/ipv6/reassembly.c