Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 21 Jul 2011 19:39:35 +0000 (12:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Jul 2011 19:39:35 +0000 (12:39 -0700)
commitf5caadbb3d8fc0b71533e880c684b2230bdb76ac
tree7a23a2b44f6e043d9cb6ad4245b78da4bd2e14b0
parent0ca87f05ba8bdc6791c14878464efc901ad71e99
parent0f598f0b4c3b2259366cfa8adc01bd8e714c82d0
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6
net/netfilter/nfnetlink_queue.c