Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
David S. Miller [Sun, 1 Apr 2012 20:47:08 +0000 (16:47 -0400)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge