Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Mon, 10 May 2010 22:08:11 +0000 (15:08 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Mon, 10 May 2010 22:08:11 +0000 (15:08 -0700)
commita15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3
treeb1774dad1d72b70d88ab6c51ff4b87697dfca57a
parent9459d59fbf0bc82ff4c804679fa8bc22788eca63
parent562db532760827f6ce30801a08e6b568848bc9f2
Merge branch 'wireless-2.6' into wireless-next-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-dev.h
net/mac80211/mlme.c