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, 2 Dec 2011 16:20:01 +0000 (08:20 -0800)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 2 Dec 2011 16:20:01 +0000 (08:20 -0800)
commitbaa7248f6a1d75227f4e513c780515fb8e10d6b4
tree38d9cb914c31f2bc0dcfd7ab0d378f3dd108ee1e
parent98dfe98089f7f61f473bcfd906f37b8a4aec03aa
parentba5736a5e9ac20c378ae4179e8a0ed3cc4b44351
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into wireless-next