commit 02d6112cd7d75bf30685ee4b2e9dc0291b4d3133
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Jul 20 12:01:59 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Jul 20 12:01:59 2007 -0700
tree b1715624dadae286cac16deb5a634a33f4a46aa6
parent 0b1937ac0ef1541c0ea44e6f81c33d2f59803957
parent 941091024ef0f2f7e09eb81201d293ac18833cc8

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] User stack pointer randomisation
  [MIPS] Remove unused include/asm-mips/gfx.h
  [MIPS] Remove unused include/asm-mips/ds1216.h
  [MIPS] Workaround for RM7000 WAIT instruction aka erratum 38
  [MIPS] Make support for weakly ordered LL/SC a config option.
  [MIPS] Disable UserLocal runtime detection on platforms which never have it.
  [MIPS] Disable MT runtime detection on platforms which never support MT.