Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2008 23:56:47 +0000 (15:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2008 23:56:47 +0000 (15:56 -0800)

Trivial merge