| commit | c0ddd04d55e0a4d1506b6b8a4eb9e2b62f3aa41d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jan 21 13:41:18 2008 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jan 28 15:08:45 2008 -0800 |
| tree | c2ef87cc24fd7063c70d1979e127774e49e3ee56 | |
| parent | 1e637c74b0f84eaca02b914c0b8c6f67276e9697 [diff] |
wireless: cleanup some merge errors Signed-off-by: John W. Linville <linville@tuxdriver.com>