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: SMTC: Fix lockup in smtc_distribute_timer
  MIPS: TXx9: Update rbtx49xx_defconfig
  MIPS: Make local arrays with CL_SIZE static __initdata
  MIPS: Add DMA declare coherent memory support
  MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs.

...

This commit is contained in:

Linus Torvalds 2009-11-14 13:03:24 -08:00

parent cd4ca27d3d 5df9d11be4

commit 24dfb2b586

10 changed files with 230 additions and 96 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

1

arch/mips/Kconfig

View file

2

arch/mips/bcm47xx/prom.c

View file

252

arch/mips/configs/rbtx49xx_defconfig

View file

11

arch/mips/include/asm/dma-mapping.h

View file

3

arch/mips/kernel/cevt-smtc.c

View file

41

arch/mips/math-emu/cp1emu.c

View file

7

arch/mips/mm/dma-default.c

View file

3

arch/mips/mti-malta/malta-memory.c

View file

2

arch/mips/rb532/prom.c

View file

4

arch/mips/txx9/generic/setup.c

View file