From: Kalle Valo Date: Tue, 4 Feb 2014 16:29:45 +0000 (+0200) Subject: Merge remote-tracking branch 'wireless-next/master' into ath-next X-Git-Tag: v3.15-rc1~113^2~159^2^2~132^2~19 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6ceb339109adf88a27b6f596c9f99a095f762659;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'wireless-next/master' into ath-next --- 6ceb339109adf88a27b6f596c9f99a095f762659