Russell King 2d13ccaa87 Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable ...

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.

2011-11-21 21:56:56 +00:00

..

include/mach

Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

2011-11-21 21:56:56 +00:00

clock.c

Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2

2011-10-04 20:20:08 +09:00

cpu.c

Merge branch 'depends/rmk/memory_h' into next/cleanup2

2011-11-01 04:58:59 +01:00

dev-audio.c

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

dev-spi.c

ARM: SAMSUNG: Add tx_st_done variable

2011-07-06 15:03:08 +09:00

dev-uart.c

ARM: SAMSUNG: Remove uart irq handling from plaform code

2011-08-23 10:48:31 -07:00

dma.c

Merge branch 'next/topic-dma-samsung' into next-samsung-devel

2011-10-04 18:57:38 +09:00

irq-eint.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

irq-pm.c

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

irq.c

ARM: SAMSUNG: Remove uart irq handling from plaform code

2011-08-23 10:48:31 -07:00

Kconfig

ARM: S3C64XX: Use module identification for Cragganmore system builds

2011-09-19 16:32:36 +09:00

mach-anw6410.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-crag6410-module.c

ARM: S3C64XX: Add devices for Kilchoman audio module on Cragganmore

2011-09-19 16:33:03 +09:00

mach-crag6410.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-hmt.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-mini6410.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-ncp.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-real6410.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-smartq5.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-smartq7.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-smartq.c

ARM: 6351/1: s3c64xx: don't put smartq_bl_init in .init.text

2010-09-02 16:36:07 +01:00

mach-smartq.h

…

mach-smdk6400.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

mach-smdk6410.c

ARM: s3c64xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

Makefile

ARM: S3C64XX: To merge devs.c files to one devs.c

2011-10-06 11:14:59 +09:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

pm.c

ARM: S3C64XX: Save/restore S3C64XX_MODEM_MIFPCON on suspend/resume

2011-09-19 16:38:05 +09:00

s3c6400.c

ARM: SAMSUNG: Moving each SoC support header files

2011-10-04 19:48:43 +09:00

s3c6410.c

ARM: SAMSUNG: Moving each SoC support header files

2011-10-04 19:48:43 +09:00

setup-fb-24bpp.c

ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx

2011-07-21 02:11:39 +09:00

setup-i2c0.c

ARM: S3C64XX: Remove gpio-bank-X header files

2011-05-06 09:37:36 +09:00

setup-i2c1.c

ARM: S3C64XX: Remove gpio-bank-X header files

2011-05-06 09:37:36 +09:00

setup-ide.c

ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped

2010-10-25 16:04:33 +09:00

setup-keypad.c

ARM: S3C64XX: Fix keypad setup to configure correct number of rows

2011-03-04 15:46:26 +09:00

setup-sdhci-gpio.c

ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull()

2010-10-23 11:51:37 +09:00

setup-sdhci.c

ARM: SAMSUNG: remove sdhci default configuration setup platform helper

2011-10-04 19:48:40 +09:00

sleep.S

ARM: pm: samsung: move cpu_suspend into C code

2011-06-24 08:48:44 +01:00