Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:28:31 +0000 (16:28 -0800)

Trivial merge