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 Dec 2011 23:00:27 +0000 (15:00 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 8 Dec 2011 23:00:27 +0000 (15:00 -0800)
commite5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6
tree3f021986a2415cfe9c2dca0bcc22411740dcd9b3
parentdd5fe1046cb07d2a6665b6dbbfc6989b39ae063b
parentf589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into wireless-next