tree af0d9f8103e1a782d78ef522272b838e2d4c92d3
parent 04850a47aa7d03cbf651a91262fdaa9f18373dfc
author John W. Linville <linville@tuxdriver.com> 1206662053 -0400
committer John W. Linville <linville@tuxdriver.com> 1207084397 -0400

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>