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: PowerTV: Fix support for timer interrupts with > 64 external IRQs
  MIPS: PowerTV: Streamline access to platform device registers
  MIPS: Fix vmlinuz build for 32bit-only math shells
  MIPS: Add support of LZO-compressed kernels

...

This commit is contained in:

Linus Torvalds 2010-01-28 12:59:43 -08:00

parent 551e28dbe8 010c108d7a

commit d4d37bde3d

13 changed files with 391 additions and 308 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

9

arch/mips/boot/compressed/Makefile

View file

4

arch/mips/boot/compressed/decompress.c

View file

1

arch/mips/include/asm/irq.h

View file

90

arch/mips/include/asm/mach-powertv/asic_reg_map.h

View file

137

arch/mips/include/asm/mach-powertv/asic_regs.h

View file

12

arch/mips/include/asm/mipsregs.h

View file

2

arch/mips/kernel/cevt-r4k.c

View file

6

arch/mips/kernel/traps.c

View file

131

arch/mips/powertv/asic/asic-calliope.c

View file

131

arch/mips/powertv/asic/asic-cronus.c

View file

131

arch/mips/powertv/asic/asic-zeus.c

View file

46

arch/mips/powertv/asic/asic_devices.c

View file