diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-01-24 13:08:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-31 19:26:33 -0800 |
| commit | 4bdb0fba9e53dc263eb9601404d097dd99e60f83 (patch) | |
| tree | fcffdab76710a231579fd927203cb0f50ced7657 /drivers/net/ioc3-eth.c | |
| parent | 13f09b95a82c46ed608d057b22e0dd18ebfff22a (diff) | |
rt61pci: fix-up merge damage
A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ioc3-eth.c')
0 files changed, 0 insertions, 0 deletions