From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Sep 2008 19:38:09 +0000 (-0700)
Subject: wireless: restore revert lost to merge damage
X-Git-Tag: v2.6.28-rc1~717^2~110^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74af025073461b9ebe82771e48a5b8596c3cf75c;p=pandora-kernel.git

wireless: restore revert lost to merge damage

Restore revert "mac80211: Use IWEVASSOCREQIE instead of IWEVCUSTOM",
originally reverted in commit bf7394ccc13fe291d9258f01113b4c61214ddeae.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed