From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 22 May 2014 17:58:36 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~122^2^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a10fd740a4d5a9f3da255cf8dae48c6723d1a6;p=pandora-kernel.git

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

40a10fd740a4d5a9f3da255cf8dae48c6723d1a6
Reading git-diff-tree failed