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, 2 Feb 2012 21:38:27 +0000 (13:38 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 2 Feb 2012 21:38:27 +0000 (13:38 -0800)
commit96d28e00d5cf0d1b3dbf775fa79bd940838a10e4
tree82915b1e24f204babeb65e1d517115c0e31cfd9a
parent4c7d2fe9b116f749bc8362da33a628d6654e42b4
parentb0302aba812bcc39291cdab9ad7e37008f352a91
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into wireless-next