Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse source

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

...

This commit is contained in:

Linus Torvalds 2010-05-16 11:11:31 -07:00

parent 18e41da89d 4e73238d16

commit d34e14f690

4 changed files with 21 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

arch/mips/include/asm/mipsregs.h

View file

2

arch/mips/kernel/scall64-n32.S

View file

15

arch/mips/math-emu/cp1emu.c

View file

2

arch/mips/oprofile/op_model_loongson2.c

View file