Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 23:14:22 +0000 (16:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Jun 2008 23:14:22 +0000 (16:14 -0700)

Trivial merge