Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 5 Jan 2011 21:06:25 +0000 (16:06 -0500)]
Conflicts:
net/bluetooth/Makefile

1  2 
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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge