wireless: cleanup some merge errors
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Jan 2008 18:41:18 +0000 (13:41 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:08:45 +0000 (15:08 -0800)
Signed-off-by: John W. Linville <linville@tuxdriver.com>

No differences found