| commit | 8a88ca8f7fd15d06e53a848c6b3558ed9973327c | [log] [tgz] |
|---|---|---|
| author | Ralf Baechle <ralf@linux-mips.org> | Thu Nov 02 17:23:33 2006 +0000 |
| committer | Ralf Baechle <ralf@linux-mips.org> | Thu Nov 02 17:23:33 2006 +0000 |
| tree | a2c6f538a04ade1758a64e0c877e9b817da83d5f | |
| parent | 8427829711b35e0e62668618cec577f65c102935 [diff] |
[MIPS] Fix merge screwup by patch(1) Patch happily applied an Ocelot G patch to Ocelot C when merging linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into kernel.org as 6ceb6d3ab2d402cea326320a4143db90a66fd216. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>