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] Ensure that ST0_FR is never set on a 32 bit kernel
  [MIPS] time: Delete weak definition of plat_time_init() due to gcc bug.
  [MIPS] PCI: Make pcibios_fixup_device_resources ignore legacy resources.
  [MIPS] Atlas, Malta: Don't free firmware memory on free_initmem.
  [MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr()
  [MIPS] Alchemy: fix PCI resource conflict
  [MIPS] time: Set up Cobalt's mips_hpt_frequency

...

This commit is contained in:

Linus Torvalds 2007-12-17 08:41:25 -08:00

parent 6e3013932e bbaf238b5f

commit 7b286af392

10 changed files with 41 additions and 32 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

9

arch/mips/au1000/Kconfig

View file

8

arch/mips/au1000/common/pci.c

View file

9

arch/mips/au1000/common/setup.c

View file

21

arch/mips/cobalt/time.c

View file

3

arch/mips/kernel/process.c

View file

4

arch/mips/kernel/time.c

View file

6

arch/mips/kernel/traps.c

View file

2

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

View file

2

arch/mips/pci/pci.c

View file

9

include/asm-mips/mach-au1x00/au1000.h

View file