Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2009 05:43:16 +0000 (22:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2009 05:43:16 +0000 (22:43 -0700)

Trivial merge