Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 21 Nov 2007 01:24:29 +0000 (17:24 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 21 Nov 2007 01:24:29 +0000 (17:24 -0800)

Trivial merge