Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Jun 2010 20:41:55 +0000 (13:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jun 2010 20:41:55 +0000 (13:41 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge