Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 19 Jul 2007 01:21:44 +0000 (18:21 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 19 Jul 2007 01:21:44 +0000 (18:21 -0700)

Trivial merge