From: Wey-Yi Guy Date: Thu, 12 Apr 2012 21:07:13 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Tag: next-20120417~44^2~29^2~24 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=586c7ecc78949f03c9f31735f4935abef38f8f2b;p=karo-tx-linux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next --- 586c7ecc78949f03c9f31735f4935abef38f8f2b