Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Nov 2010 19:04:26 +0000 (11:04 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Nov 2010 19:04:26 +0000 (11:04 -0800)

Trivial merge