Merge branch 'new-drivers' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Fri, 19 Sep 2008 22:51:35 +0000 (15:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Sep 2008 22:51:35 +0000 (15:51 -0700)

Trivial merge