From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 13 Jun 2012 18:05:40 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.5-rc5~17^2~34^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1f7e0102820f11a0dcd3a2f90140abf14c894ba8;p=linux.git

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

1f7e0102820f11a0dcd3a2f90140abf14c894ba8