tree e75b98b228bb4e456c30673fcc4b56ffa1d09cf5
parent c68ed255265968c3948fa2678bf59d15c471b055
parent 672724403b42da1d276c6cf811e8e34d15efd964
author John W. Linville <linville@tuxdriver.com> 1272048225 -0400
committer John W. Linville <linville@tuxdriver.com> 1272048225 -0400

Merge branch 'master' into for-davem

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c