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
clock-exynos4210.c
clock-exynos4212.c
clock.c
cpu.c	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
cpuidle.c
dev-ahci.c
dev-audio.c
dev-dwmci.c
dev-pd.c
dev-sysmmu.c
dma.c
headsmp.S
hotplug.c
init.c
irq-combiner.c
irq-eint.c	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
Kconfig
mach-armlex4210.c
mach-nuri.c
mach-origen.c
mach-smdk4x12.c
mach-smdkv310.c
mach-universal_c210.c
Makefile
Makefile.boot
mct.c	ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS	2011-12-08 10:09:32 +09:00
platsmp.c
pm.c	arm: convert sysdev_class to a regular subsystem	2011-12-21 16:01:38 -08:00
pmu.c
setup-fimc.c
setup-fimd0.c
setup-i2c0.c
setup-i2c1.c
setup-i2c2.c
setup-i2c3.c
setup-i2c4.c
setup-i2c5.c
setup-i2c6.c
setup-i2c7.c
setup-keypad.c
setup-sdhci-gpio.c
setup-sdhci.c
setup-usb-phy.c