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: Fix CONFIG_FLATMEM version of pfn_valid()
  MIPS: Reorganize Cavium OCTEON PCI support.
  Update Yoichi Yuasa's e-mail address
  MIPS: Allow suspend and hibernation again on uniprocessor kernels.
  MIPS: 64-bit: Fix o32 core dump
  MIPS: BC47xx: Fix SSB irq setup
  MIPS: CMP: Update sync-r4k for current kernel
  MIPS: CMP: Move gcmp_probe to before the SMP ops
  MIPS: CMP: activate CMP support
  MIPS: CMP: Extend IPI handling to CPU number
  MIPS: CMP: Extend the GIC IPI interrupts beyond 32
  MIPS: Define __arch_swab64 for all mips r2 cpus
  MIPS: Update VR41xx GPIO driver to use gpiolib
  MIPS: Hookup new syscalls sys_rt_tgsigqueueinfo and sys_perf_counter_open.
  MIPS: Malta: Remove unnecessary function prototypes
  MIPS: MT: Remove unnecessary semicolons
  MIPS: Add support for Texas Instruments AR7 System-on-a-Chip

...

This commit is contained in:

Linus Torvalds 2009-07-04 09:47:01 -07:00

parent f1a745710f baf9227802

commit 4806626782

111 changed files with 6599 additions and 3344 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

29

arch/mips/Kconfig

View file

7

arch/mips/Makefile

View file

10

arch/mips/ar7/Makefile

View file

440

arch/mips/ar7/clock.c

View file

48

arch/mips/ar7/gpio.c

View file

176

arch/mips/ar7/irq.c

View file

72

arch/mips/ar7/memory.c

View file

555

arch/mips/ar7/platform.c

View file

297

arch/mips/ar7/prom.c

View file

94

arch/mips/ar7/setup.c

View file

30

arch/mips/ar7/time.c

View file

4

arch/mips/cavium-octeon/Makefile

View file

2

arch/mips/cavium-octeon/dma-octeon.c

View file

137

arch/mips/cavium-octeon/pci-common.c

View file

2

arch/mips/cobalt/buttons.c

View file

2

arch/mips/cobalt/lcd.c

View file

2

arch/mips/cobalt/led.c

View file

2

arch/mips/cobalt/mtd.c

View file

2

arch/mips/cobalt/rtc.c

View file

2

arch/mips/cobalt/serial.c

View file

2

arch/mips/cobalt/time.c

View file

1182

arch/mips/configs/ar7_defconfig

View file

2

arch/mips/gt64120/wrppmc/serial.c

View file

7

arch/mips/include/asm/amon.h

View file

2

arch/mips/include/asm/ds1287.h

View file

4

arch/mips/include/asm/elf.h

View file

2

arch/mips/include/asm/gcmpregs.h

View file

6

arch/mips/include/asm/gic.h

View file

2

arch/mips/include/asm/irq_gt641xx.h

View file

178

arch/mips/include/asm/mach-ar7/ar7.h

View file

110

arch/mips/include/asm/mach-ar7/gpio.h

View file

16

arch/mips/include/asm/mach-ar7/irq.h

View file

25

arch/mips/include/asm/mach-ar7/prom.h

View file

22

arch/mips/include/asm/mach-ar7/spaces.h

View file

25

arch/mips/include/asm/mach-ar7/war.h

View file

2

arch/mips/include/asm/mach-cobalt/irq.h

View file

2

arch/mips/include/asm/mach-cobalt/mach-gt64120.h

View file

30

arch/mips/cavium-octeon/pci-common.h → arch/mips/include/asm/octeon/pci-octeon.h

View file

9

arch/mips/include/asm/page.h

View file

2

arch/mips/include/asm/reg.h

View file

8

arch/mips/include/asm/swab.h

View file

18

arch/mips/include/asm/unistd.h

View file

2

arch/mips/include/asm/vr41xx/capcella.h

View file

22

arch/mips/include/asm/vr41xx/giu.h

View file

2

arch/mips/include/asm/vr41xx/irq.h

View file

2

arch/mips/include/asm/vr41xx/mpc30x.h

View file

2

arch/mips/include/asm/vr41xx/pci.h

View file

2

arch/mips/include/asm/vr41xx/siu.h

View file

2

arch/mips/include/asm/vr41xx/tb0219.h

View file

2

arch/mips/include/asm/vr41xx/tb0226.h

View file

2

arch/mips/include/asm/vr41xx/vr41xx.h

View file

20

arch/mips/kernel/binfmt_elfo32.c

View file

2

arch/mips/kernel/cevt-ds1287.c

View file

2

arch/mips/kernel/cevt-gt641xx.c

View file

2

arch/mips/kernel/csrc-ioasic.c

View file

19

arch/mips/kernel/irq-gic.c

View file

2

arch/mips/kernel/irq-gt641xx.c

View file

2

arch/mips/kernel/scall32-o32.S

View file

2

arch/mips/kernel/scall64-64.S

View file

2

arch/mips/kernel/scall64-n32.S

View file

2

arch/mips/kernel/scall64-o32.S

View file

66

arch/mips/kernel/smp-cmp.c

View file

31

arch/mips/kernel/sync-r4k.c

View file

2

arch/mips/kernel/vpe.c

View file

14

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

View file

89

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

View file

3

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

View file

5

arch/mips/pci/Makefile

View file

2

arch/mips/pci/fixup-capcella.c

View file

2

arch/mips/pci/fixup-mpc30x.c

View file

2

arch/mips/pci/fixup-tb0219.c

View file

2

arch/mips/pci/fixup-tb0226.c

View file

2

arch/mips/pci/fixup-tb0287.c

View file

56

arch/mips/cavium-octeon/msi.c → arch/mips/pci/msi-octeon.c

View file

6

arch/mips/pci/ops-vr41xx.c

View file

147

arch/mips/cavium-octeon/pci.c → arch/mips/pci/pci-octeon.c

View file

6

arch/mips/pci/pci-vr41xx.c

View file

4

arch/mips/pci/pci-vr41xx.h

View file

37

arch/mips/cavium-octeon/pcie.c → arch/mips/pci/pcie-octeon.c

View file

2

arch/mips/vr41xx/casio-e55/setup.c

View file

8

arch/mips/vr41xx/common/bcu.c

View file

8

arch/mips/vr41xx/common/cmu.c

View file

2

arch/mips/vr41xx/common/giu.c

View file

8

arch/mips/vr41xx/common/icu.c

View file

2

arch/mips/vr41xx/common/init.c

View file

2

arch/mips/vr41xx/common/irq.c

View file

2

arch/mips/vr41xx/common/pmu.c

View file

2

arch/mips/vr41xx/common/rtc.c

View file

2

arch/mips/vr41xx/common/siu.c

View file

2

arch/mips/vr41xx/common/type.c

View file

2

arch/mips/vr41xx/ibm-workpad/setup.c

View file

4

drivers/char/Kconfig

View file

1

drivers/char/Makefile

View file

4

drivers/char/tb0219.c

View file

680

drivers/char/vr41xx_giu.c

View file

6

drivers/gpio/Kconfig

View file

1

drivers/gpio/Makefile

View file

586

drivers/gpio/vr41xx_giu.c

View file

4

drivers/input/misc/cobalt_btns.c

View file

2

drivers/leds/leds-cobalt-raq.c

View file

Some files were not shown because too many files have changed in this diff Show more