From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 2 Aug 2012 17:49:38 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
X-Git-Tag: v3.6-rc2~24^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a26904eb63150bba2120fc2864e9307d1500691;p=pandora-kernel.git

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

1a26904eb63150bba2120fc2864e9307d1500691
Reading git-diff-tree failed