Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Jan 2011 21:06:25 +0000 (16:06 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Jan 2011 21:06:25 +0000 (16:06 -0500)
commitc96e96354a6c9456cdf1f150eca504e2ea35301e
tree751bec601fb8152116b8e31e0f1f83d687a37d6f
parentdbbe68bb12b34f3e450da7a73c20e6fa1f85d63a
parent33af88138b859f515b365a074e0a014d7cdbf846
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
net/bluetooth/Makefile
MAINTAINERS
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/rx.c
net/mac80211/tx.c