diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-01-21 13:41:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:45 -0500 |
| commit | c0ddd04d55e0a4d1506b6b8a4eb9e2b62f3aa41d (patch) | |
| tree | c2ef87cc24fd7063c70d1979e127774e49e3ee56 /drivers/net/wireless/ipw2200.c | |
| parent | 1e637c74b0f84eaca02b914c0b8c6f67276e9697 (diff) | |
wireless: cleanup some merge errors
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
0 files changed, 0 insertions, 0 deletions