Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 15 Aug 2007 01:32:20 +0000 (18:32 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 15 Aug 2007 01:32:20 +0000 (18:32 -0700)

Trivial merge