Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Feb 2008 11:52:44 +0000 (03:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Feb 2008 11:52:44 +0000 (03:52 -0800)

Trivial merge