Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Jan 2010 21:15:47 +0000 (13:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Jan 2010 21:15:47 +0000 (13:15 -0800)

Trivial merge