tree b32c1412837a0041800b1dfdc0abd65685b0bc71
parent 246f19d194ec99ee8992106e129a133142dc6a10
parent 04a9e451fdbbfb84d6b87042b991f729f1c14249
author David S. Miller <davem@davemloft.net> 1202042614 -0800
committer David S. Miller <davem@davemloft.net> 1202042614 -0800

Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6