kernel-hacking-2024-linux-s.../arch/arm/mach-s3c64xx
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
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
irq-pm.c
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-smartq.c
mach-smartq.h
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-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
setup-i2c0.c
setup-i2c1.c
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-sdhci.c ARM: SAMSUNG: remove sdhci default configuration setup platform helper 2011-10-04 19:48:40 +09:00
sleep.S