tree ff58da14f35ec5596d2c3e82267394206f106a8c
parent c39c06b96175a75e63da38dc3557a69e18a5f8ac
parent 09abbcffb3ee63fb8712c008df0c6878860777b7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227532 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227532 -0700

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] cpu-bugs64.c: GCC 3.3 constraint workaround
  [MIPS] DEC: Initialise ioasic_ssr_lock