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] Replace 40c7869b69 kludge
  [MIPS] Lasat: Fix built in separate object directory.
  [MIPS] Malta: Fix software reset on big endian
  [MIPS] pnx8xxx: move to clocksource
  [MIPS] Wrong CONFIG option prevents setup of DMA zone.

...

This commit is contained in:

Linus Torvalds 2008-01-11 11:48:00 -08:00

parent 8dab637612 e452e94e21

commit 22fb53c943

6 changed files with 85 additions and 51 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

7

arch/mips/kernel/setup.c

View file

6

arch/mips/lasat/image/Makefile

View file

2

arch/mips/mips-boards/generic/memory.c

View file

10

arch/mips/mips-boards/generic/reset.c

View file

2

arch/mips/mm/dma-default.c

View file

109

arch/mips/philips/pnx8550/common/time.c

View file