Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:13:24 +0000 (13:13 -0800)

Trivial merge