Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 May 2010 18:11:31 +0000 (11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 May 2010 18:11:31 +0000 (11:11 -0700)
commitd34e14f690d611ffe3db09e4ed8123d86c89a831
treedc7d6716e2550834816e29e5928a60c00c97d9fc
parent18e41da89d55014d25b9a24502ee92b7f50599f9
parent4e73238d163c6fcf001264832701d2a6d4927672
Merge branch 'upstream' of git://ftp.linux-mips.org/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