Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
David S. Miller [Thu, 21 Jul 2011 19:39:35 +0000 (12:39 -0700)]
1  2 
net/netfilter/nfnetlink_queue.c

Simple merge