Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 16:50:38 +0000 (09:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 16:50:38 +0000 (09:50 -0700)
commit364ae953a48152be11f1aa424cbfd943b7762b0d
tree6873b352af1aa2dd6baa223b951eff4d6e74b1ae
parent075f664689b40217539ebfe856fab73d302a15f1
parentf39a9410ed0503278fd5edc559fa019051413039
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6