Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 8 Mar 2012 19:13:29 +0000 (11:13 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 8 Mar 2012 19:13:29 +0000 (11:13 -0800)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge