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)
commitc0ddd04d55e0a4d1506b6b8a4eb9e2b62f3aa41d
treec2ef87cc24fd7063c70d1979e127774e49e3ee56
parent1e637c74b0f84eaca02b914c0b8c6f67276e9697
wireless: cleanup some merge errors

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/xmit.c
drivers/net/wireless/b43legacy/xmit.c