From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Nov 2012 18:59:51 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0f62248501cbf5047486601d7e39d5ee36d478c2;p=~shefty%2Frdma-dev.git

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

0f62248501cbf5047486601d7e39d5ee36d478c2