Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Fri, 4 Dec 2009 21:25:15 +0000 (13:25 -0800)]
1  2 
MAINTAINERS
include/net/mac80211.h
net/mac80211/ieee80211_i.h
net/mac80211/rx.c
net/wireless/scan.c
net/wireless/wext-core.c

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