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, 25 Feb 2010 02:23:37 +0000 (18:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Feb 2010 02:23:37 +0000 (18:23 -0800)

Trivial merge