From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 11 Nov 2009 21:04:42 +0000 (-0800)
Subject: iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
X-Git-Tag: v2.6.33-rc1~388^2~415
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b;p=pandora-kernel.git

iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage

I may have botched my merge conflict resolution instructions for Dave...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed