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
..
csp	Fix common misspellings	2011-03-31 11:26:23 -03:00
include	ARM: mach-bcmring: remove mach/memory.h	2011-10-13 12:49:48 -04:00
arch.c	ARM: platform fixups: remove mdesc argument to fixup function	2011-10-17 09:13:41 +01:00
clock.c	ARM: 6483/1: arm & sh: factorised duplicated clkdev.c	2010-11-26 10:51:04 +00:00
clock.h	ARM: 5644/1: add bcmring core.c, clock.c, clock.h	2009-08-15 16:01:38 +01:00
core.c	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
core.h	ARM: 6912/1: bcmring: Add clkdev table in init_early	2011-05-23 18:04:54 +01:00
dma_device.c	ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c	2009-08-15 16:01:40 +01:00
dma.c	ARM: 7154/1: mach-bcmring: fix build error in dma.c	2011-11-09 21:53:35 +00:00
irq.c	Remove unneeded version.h includes from arch/arm/	2011-09-15 14:57:06 +02:00
Kconfig	bcmring: drop commented out line in Kconfig	2011-10-06 17:50:47 +02:00
Makefile	ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring	2009-08-15 16:01:50 +01:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mm.c	arm: fix implicit use of page.h in several arch/arm files	2011-10-31 19:30:46 -04:00
timer.c	Remove unneeded version.h includes from arch/arm/	2011-09-15 14:57:06 +02:00