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

Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c
This commit is contained in:
John W. Linville 2010-09-24 15:52:34 -04:00
commit 29ad2facd4
14 changed files with 52 additions and 20 deletions