tree bd995c9219e69823d09fd222c6ebeb05dd225c43
parent 6e3013932e97a0e034d55419c60ae4a8a229ceb8
parent bbaf238b5f910f8f3dda4b96cf844f50b2dcc6fa
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197909685 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197909685 -0800

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

* '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