Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 4 Jan 2011 19:57:25 +0000 (11:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Jan 2011 19:57:25 +0000 (11:57 -0800)

Trivial merge