From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 6 Feb 2014 19:34:31 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.14-rc3~36^2~27^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199160bbc9271b9351c062a477699fea72b29e3a;p=pandora-kernel.git

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

199160bbc9271b9351c062a477699fea72b29e3a
Reading git-diff-tree failed