Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
commit9687c637388f63b87fcc18eee6e65bcfca4f49ca
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Oct 2011 19:39:21 +0000 (11 15:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Oct 2011 19:39:21 +0000 (11 15:39 -0400)
tree0929bb8dc602c4f86b6b2e95bca94015de2b0868
parent258daca2bc9f97ace65c9480c901fddfce1e20cf
parent094daf7db7c47861009899ce23f9177d761e20b0
Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next