Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Thu, 29 Jul 2010 18:47:07 +0000 (14:47 -0400)]
1  2 
MAINTAINERS
include/net/mac80211.h
net/mac80211/cfg.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge