tree e07fa00abdd55b31e22567786c78635f32c6a66c
parent 6ba1037c3d871ab70e342631516dbf841c35b086
parent b37e3b6d64358604960b35e8ecbb7aed22e0926e
author John W. Linville <linville@tuxdriver.com> 1302639524 -0400
committer John W. Linville <linville@tuxdriver.com> 1302639524 -0400

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

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c