From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 19 Jul 2012 16:35:00 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: dm-3.6-changes~85^2~57^2~1
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=3e497e0215ae1d552a69bd88ea0d1a004f71cccd;p=linux-dmdedup.git

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

3e497e0215ae1d552a69bd88ea0d1a004f71cccd