From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 9 Jul 2012 20:34:39 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
X-Git-Tag: v3.6-rc1~125^2~57^2~208
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af5491c2f6069bb6cff4260619749a90a208c98;p=pandora-kernel.git

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

0af5491c2f6069bb6cff4260619749a90a208c98
Reading git-diff-tree failed