Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse source

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Cacheops.h: Fix typo.
  [MIPS] Cobalt: Qube1 has no serial port so don't use it
  [MIPS] Cobalt: Fix ethernet interrupts for RaQ1
  [MIPS] Kconfig fixes for BCM47XX platform

...

This commit is contained in:

Linus Torvalds 2008-01-14 21:25:39 -08:00

parent c23f72cae9 2e4f95822c

commit c60ecec67a

4 changed files with 9 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

2

arch/mips/Kconfig

View file

5

arch/mips/cobalt/console.c

View file

2

arch/mips/pci/fixup-cobalt.c

View file

2

include/asm-mips/cacheops.h

View file