From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 14 Nov 2012 19:15:43 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13627^2~3^2~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bd2a81307487eba486f200423330d2403d0b893b;p=mirror_ubuntu-artful-kernel.git

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

bd2a81307487eba486f200423330d2403d0b893b