Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 19 May 2011 19:55:45 +0000 (15:55 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 May 2011 19:55:45 +0000 (15:55 -0400)

Trivial merge