From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 21 Nov 2012 19:43:51 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.8-rc1~139^2~174^2^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
---

75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7