From: Wey-Yi Guy Date: Fri, 25 Nov 2011 18:48:00 +0000 (-0800) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Tag: master-2011-12-13~72^2~40 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=27f6cbecbf60e2dd2be49a945e9966ed6b20b2de;p=~andy%2Flinux Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next --- 27f6cbecbf60e2dd2be49a945e9966ed6b20b2de