From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 May 2010 18:11:31 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.0~4994
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d34e14f690d611ffe3db09e4ed8123d86c89a831;p=platform%2Fkernel%2Flinux-amlogic.git

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

d34e14f690d611ffe3db09e4ed8123d86c89a831