From: Kalle Valo Date: Wed, 14 May 2014 13:20:08 +0000 (+0300) Subject: Merge remote-tracking branch 'wireless-next/master' into ath-next X-Git-Tag: v3.16-rc1~27^2~99^2^2~1^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e21353576df1fae38710bdbff1c3abfe49f651cd;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'wireless-next/master' into ath-next --- e21353576df1fae38710bdbff1c3abfe49f651cd