From: John W. Linville Date: Wed, 9 Jan 2013 19:22:45 +0000 (-0500) Subject: Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next X-Git-Tag: v3.9-rc1~139^2~242^2^2~46 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=79afb22d093993ef50f250f5368b565d0a0b7569;p=users%2Fjedix%2Flinux-maple.git Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next --- 79afb22d093993ef50f250f5368b565d0a0b7569