From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 27 Mar 2008 23:54:13 +0000 (-0400)
Subject: rt2x00: fixup some non-functional merge errors
X-Git-Tag: v2.6.26-rc1~1138^2~257
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3480a58a90cd505578b9979d878a5ad9c347d424;p=pandora-kernel.git

rt2x00: fixup some non-functional merge errors

These small changes restore the rt2x00 sources to the way Ivo intended.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed