From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Nov 2013 20:47:18 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.13-rc4~3^2~64^2^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d5aedd7e1b2f024ced0486aeb730bc56875e5ac9;p=linux.git

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

d5aedd7e1b2f024ced0486aeb730bc56875e5ac9