Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Nov 2010 01:52:32 +0000 (18:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Nov 2010 01:52:32 +0000 (18:52 -0700)

Trivial merge