Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc

Browse source

* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Remove board specific GPIO init
  ARM: LPC32xx: Provide DMA filter callbacks via platform data
  ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
  + sync to 3.6-rc4

...

This commit is contained in:

Olof Johansson 2012-09-07 15:02:20 -07:00

parent 301fd5c132 7a5deff68f

commit cba82925c2

225 changed files with 2054 additions and 1466 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

10

Documentation/block/00-INDEX

View file

77

Documentation/block/cfq-iosched.txt

View file

64

Documentation/block/queue-sysfs.txt

View file

8

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

View file

2

Documentation/watchdog/src/watchdog-test.c

View file

2

Makefile

View file

1

arch/arm/Kconfig

View file

5

arch/arm/boot/dts/am33xx.dtsi

View file

4

arch/arm/boot/dts/imx51-babbage.dts

View file

6

arch/arm/boot/dts/kirkwood-iconnect.dts

View file

3

arch/arm/boot/dts/twl6030.dtsi

View file

1

arch/arm/configs/u8500_defconfig

View file

3

arch/arm/mach-dove/common.c

View file

7

arch/arm/mach-exynos/mach-origen.c

View file

7

arch/arm/mach-exynos/mach-smdkv310.c

View file

10

arch/arm/mach-imx/Makefile

View file

8

arch/arm/mach-imx/clk-imx6q.c

View file

0

arch/arm/mach-imx/head-v7.S → arch/arm/mach-imx/headsmp.S

View file

23

arch/arm/mach-imx/hotplug.c

View file

4

arch/arm/mach-imx/mach-imx6q.c

View file

3

arch/arm/mach-kirkwood/Makefile.boot

View file

4

arch/arm/mach-kirkwood/common.c

View file

7

arch/arm/mach-lpc32xx/irq.c

View file

20

arch/arm/mach-lpc32xx/phy3250.c

View file

2

arch/arm/mach-mmp/sram.c

View file

2

arch/arm/mach-mv78xx0/addr-map.c

View file

6

arch/arm/mach-mv78xx0/common.c

View file

3

arch/arm/mach-omap2/Kconfig

View file

2

arch/arm/mach-omap2/board-igep0020.c

View file

1

arch/arm/mach-omap2/board-omap3evm.c

View file

11

arch/arm/mach-omap2/common-board-devices.c

View file

1

arch/arm/mach-omap2/common-board-devices.h

View file

3

arch/arm/mach-omap2/cpuidle44xx.c

View file

1

arch/arm/mach-omap2/mux.h

View file

2

arch/arm/mach-omap2/opp4xxx_data.c

View file

21

arch/arm/mach-omap2/pm34xx.c

View file

8

arch/arm/mach-omap2/sleep44xx.S

View file

1

arch/arm/mach-omap2/twl-common.c

View file

3

arch/arm/mach-orion5x/common.c

View file

3

arch/arm/mach-s3c24xx/include/mach/dma.h

View file

1

arch/arm/mach-ux500/Kconfig

View file

10

arch/arm/mach-ux500/board-mop500-msp.c

View file

4

arch/arm/mach-ux500/board-mop500.c

View file

6

arch/arm/plat-omap/dmtimer.c

View file

3

arch/arm/plat-omap/include/plat/cpu.h

View file

9

arch/arm/plat-omap/include/plat/multi.h

View file

4

arch/arm/plat-omap/include/plat/uncompress.h

View file

8

arch/arm/plat-orion/common.c

View file

6

arch/arm/plat-orion/include/plat/common.h

View file

2

arch/arm/plat-s3c24xx/dma.c

View file

29

arch/arm/plat-samsung/devs.c

View file

16

arch/arm/plat-samsung/include/plat/hdmi.h

View file

2

arch/arm/plat-samsung/pm.c

View file

1

arch/mips/Kconfig

View file

2

arch/mips/alchemy/board-mtx1.c

View file

2

arch/mips/ath79/dev-usb.c

View file

6

arch/mips/ath79/gpio.c

View file

4

arch/mips/bcm63xx/dev-spi.c

View file

89

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

View file

3

arch/mips/include/asm/mach-ath79/ar71xx_regs.h

View file

1

arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h

View file

2

arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h

View file

13

arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h

View file

10

arch/mips/include/asm/mach-cavium-octeon/irq.h

View file

1

arch/mips/include/asm/module.h

View file

8

arch/mips/include/asm/r4k-timer.h

View file

43

arch/mips/kernel/module.c

View file

4

arch/mips/kernel/smp.c

View file

26

arch/mips/kernel/sync-r4k.c

View file

13

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

View file

22

arch/mips/pci/pci-ar724x.c

View file

4

arch/parisc/include/asm/atomic.h

View file

2

arch/parisc/kernel/process.c

View file

8

arch/parisc/kernel/sys_parisc.c

View file

7

arch/powerpc/boot/dts/fsl/p4080si-post.dtsi

View file

31

arch/powerpc/configs/85xx/p1023rds_defconfig

View file

31

arch/powerpc/configs/corenet32_smp_defconfig

View file

1

arch/powerpc/configs/corenet64_smp_defconfig

View file

103

arch/powerpc/configs/g5_defconfig

View file

18

arch/powerpc/configs/mpc83xx_defconfig

View file

33

arch/powerpc/configs/mpc85xx_defconfig

View file

32

arch/powerpc/configs/mpc85xx_smp_defconfig

View file

2

arch/powerpc/include/asm/cputable.h

View file

1

arch/powerpc/include/asm/kvm_host.h

View file

12

arch/powerpc/include/asm/kvm_ppc.h

View file

1

arch/powerpc/include/asm/mpic_msgr.h

View file

9

arch/powerpc/kernel/dma-iommu.c

View file

2

arch/powerpc/kernel/hw_breakpoint.c

View file

27

arch/powerpc/kernel/kgdb.c

View file

8

arch/powerpc/kernel/syscalls.c

View file

3

arch/powerpc/kvm/book3s_32_mmu_host.c

View file

2

arch/powerpc/kvm/book3s_64_mmu_host.c

View file

12

arch/powerpc/kvm/book3s_hv_rmhandlers.S

View file

11

arch/powerpc/kvm/e500_tlb.c

View file

35

arch/powerpc/lib/copyuser_power7.S

View file

4

arch/powerpc/lib/memcpy_power7.S

View file

1

arch/powerpc/mm/mem.c

View file

2

arch/powerpc/perf/core-book3s.c

View file

13

arch/powerpc/sysdev/fsl_pci.c

View file

3

arch/powerpc/sysdev/mpic_msgr.c

View file

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