From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 23 Jul 2014 17:01:14 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~215^2~11^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b8de0749276abcb86bd7a6ca6691769a4ba7987;p=pandora-kernel.git

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

3b8de0749276abcb86bd7a6ca6691769a4ba7987
Reading git-diff-tree failed