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/plat	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
adc.c	ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450	2011-10-14 15:15:42 +09:00
clock-clksrc.c	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
clock.c	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
cpu.c	ARM: SAMSUNG: Add support for handling of cpu revision	2011-08-24 19:25:19 +09:00
dev-backlight.c	ARM: SAMSUNG: remove duplicated header include	2011-12-08 10:09:29 +09:00
dev-uart.c	ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices	2011-03-04 15:46:26 +09:00
devs.c	ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung	2011-10-13 15:41:51 +09:00
dma-ops.c	arm: Add export.h to recently added files for EXPORT_SYMBOL	2011-11-07 10:28:58 -08:00
dma.c	ARM: SAMSUNG: DMA Cleanup as per sparse	2011-07-16 15:50:19 +09:00
init.c	ARM: SAMSUNG: Add support for handling of cpu revision	2011-08-24 19:25:19 +09:00
irq-vic-timer.c	ARM: SAMSUNG: Add chained enrty/exit call to timer interrupt handler	2011-08-19 20:57:37 +09:00
Kconfig	Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:18:05 -07:00
Makefile	Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:18:05 -07:00
pd.c	ARM: SAMSUNG: inclusion export.h instead of module.h	2011-11-17 01:14:38 +09:00
platformdata.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pm-check.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
pm-gpio.c	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
pm.c	ARM: SAMSUNG: Update the name of regarding Samsung GPIO	2011-09-21 15:07:04 +09:00
pwm-clock.c	ARM: SAMSUNG: Consolidate plat/pwm-clock.h	2011-10-04 19:48:41 +09:00
pwm.c	ARM: SAMSUNG: inclusion export.h instead of module.h	2011-11-17 01:14:38 +09:00
s3c-dma-ops.c	arm: Add export.h to recently added files for EXPORT_SYMBOL	2011-11-07 10:28:58 -08:00
time.c	ARM: S3C24XX: Add clkdev support	2011-07-20 19:11:29 +09:00
wakeup-mask.c	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00