Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 12 Oct 2009 06:15:47 +0000 (23:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Oct 2009 06:15:47 +0000 (23:15 -0700)

Trivial merge