tree dc7d6716e2550834816e29e5928a60c00c97d9fc
parent 18e41da89d55014d25b9a24502ee92b7f50599f9
parent 4e73238d163c6fcf001264832701d2a6d4927672
author Linus Torvalds <torvalds@linux-foundation.org> 1274033491 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274033491 -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: Oprofile: Fix Loongson irq handler
  MIPS: N32: Use compat version for sys_ppoll.
  MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1