| commit | 4bdb0fba9e53dc263eb9601404d097dd99e60f83 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Jan 24 13:08:01 2008 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 31 19:26:33 2008 -0800 |
| tree | fcffdab76710a231579fd927203cb0f50ced7657 | |
| 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>