Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Thu, 3 Feb 2011 21:06:43 +0000 (13:06 -0800)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge