Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 06:23:37 +0000 (23:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 06:23:37 +0000 (23:23 -0700)

Trivial merge