Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 23 Jan 2010 08:31:06 +0000 (00:31 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 Jan 2010 08:31:06 +0000 (00:31 -0800)

Trivial merge