tree c2ef87cc24fd7063c70d1979e127774e49e3ee56
parent 1e637c74b0f84eaca02b914c0b8c6f67276e9697
author John W. Linville <linville@tuxdriver.com> 1200940878 -0500
committer David S. Miller <davem@davemloft.net> 1201561725 -0800

wireless: cleanup some merge errors

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