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)
commit586c7ecc78949f03c9f31735f4935abef38f8f2b
treed7c6c955f0e00e77bb80a3b576b49721c7c2d69b
parent9c93ac87d736814b8b6dfe4dae3ea6474a21fce3
parente96766958c914f1240317c967bb322cd3731fb17
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into wireless-next