From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Jun 2014 19:15:14 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~210^2~46^2~55
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=855df36de365fb3b49eb06c352015e3d215b43fe;p=pandora-kernel.git

Merge git://git./linux/kernel/git/jberg/mac80211-next
---

855df36de365fb3b49eb06c352015e3d215b43fe
Reading git-diff-tree failed