Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 May 2010 05:53:41 +0000 (22:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 May 2010 05:53:41 +0000 (22:53 -0700)
commitde02d72bb3cc5b3d4c873db4ca8291723dd48479
treec937017bdc271d23ef75c4e0214d45e59227b2d9
parentf0ecde1466f21edf577b809735f4f35f354777a0
parent79733a865c7fd778ce45e3503962b3a875b0a153
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
net/mac80211/mlme.c