kevin/linux
1
Fork 0
Code
ff4b8a57f0
linux/arch/arm/mach-s3c64xx
History
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
..
include/mach Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
clock.c Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 2011-10-04 20:20:08 +09:00
cpu.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08: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: S3C64XX: Add linux/export.h to dev-spi.c 2011-12-02 14:17:54 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-eint.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08: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 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-crag6410-module.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
mach-crag6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-hmt.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-mini6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-ncp.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-real6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smartq5.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smartq7.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smartq.c
mach-smartq.h
mach-smdk6400.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smdk6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01: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: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
s3c6410.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +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
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 ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00