Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
David S. Miller [Wed, 28 Mar 2012 02:15:01 +0000 (22:15 -0400)]
1  2 
MAINTAINERS
drivers/net/wireless/iwlegacy/4965-mac.c
include/net/cfg80211.h

diff --cc MAINTAINERS
Simple merge
Simple merge