[MIPS] Fix merge screwup by patch(1)

Browse source

Patch happily applied an Ocelot G patch to Ocelot C when merging
linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into
kernel.org as 6ceb6d3ab2.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

...

This commit is contained in:

Ralf Baechle 2006-11-02 17:23:33 +00:00

parent 8427829711

commit 8a88ca8f7f

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/mips/Kconfig

View file