linux/arch/arm/plat-s5p
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
clock.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
cpu.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
dev-mfc.c ARM: S5P: To merge devs.c files to one devs.c 2011-10-06 11:15:09 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
irq-eint.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
irq-gpioint.c Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07: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: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
Makefile ARM: S5P: To merge devs.c files to one devs.c 2011-10-06 11:15:09 +09:00
pm.c ARM: S5P: Remove unused s3c_pm_check_resume_pin 2011-04-14 13:19:40 +09:00
s5p-time.c Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel 2011-07-21 17:28:23 +09:00
setup-mipiphy.c ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
sleep.S ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
sysmmu.c ARM: S5P: Fix export.h inclusion 2011-11-17 01:13:34 +09:00