Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Sep 2008 23:09:13 +0000 (16:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Sep 2008 23:09:13 +0000 (16:09 -0700)

Trivial merge