From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jun 2012 18:39:53 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
X-Git-Tag: v3.6-rc1~125^2~57^2~248
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=133189a46c2c522eb4ef26b1ede63dd0a9fdc920;p=pandora-kernel.git

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
---

133189a46c2c522eb4ef26b1ede63dd0a9fdc920
Reading git-diff-tree failed