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, 20 Jan 2011 08:06:15 +0000 (00:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Jan 2011 08:06:15 +0000 (00:06 -0800)

Trivial merge