Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Feb 2011 21:08:59 +0000 (13:08 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Feb 2011 21:08:59 +0000 (13:08 -0800)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge