wireless: cleanup some merge errors

Browse source

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

...

This commit is contained in:

John W. Linville 2008-01-21 13:41:18 -05:00 • committed by David S. Miller

parent 1e637c74b0

commit c0ddd04d55

2 changed files with 36 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

drivers/net/wireless/b43/xmit.c

View file

20

drivers/net/wireless/b43legacy/xmit.c

View file