Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)

Trivial merge