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