Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2009 23:07:21 +0000 (16:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2009 23:07:21 +0000 (16:07 -0700)

Trivial merge