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, 12 Apr 2012 21:07:13 +0000 (14:07 -0700)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 12 Apr 2012 21:07:13 +0000 (14:07 -0700)

Trivial merge