tree 0617f723320d83eca5cef9c964c001014e74213f
parent 8c11e4ab09ffb975a89802dde0e9aa52a53b8aa5
parent 1144601118507f8b3b676a9a392584d216d3f2cc
author John W. Linville <linville@tuxdriver.com> 1270748094 -0400
committer John W. Linville <linville@tuxdriver.com> 1270748094 -0400

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-tx.c