Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 9 Mar 2012 17:04:47 +0000 (09:04 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 9 Mar 2012 17:04:47 +0000 (09:04 -0800)

Trivial merge