Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Feb 2008 03:58:05 +0000 (19:58 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Feb 2008 03:58:05 +0000 (19:58 -0800)

Trivial merge