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
..
boards	sh: fix build warning in board-sh7757lcr	2011-11-18 16:45:50 +09:00
boot	sh: kexec: Add PHYSICAL_START	2011-10-28 15:03:43 +09:00
cchips	sh: Convert to new function names	2011-03-29 14:48:13 +02:00
configs	sh: fix compile error using sh7757lcr_defconfig	2011-06-21 17:40:42 +09:00
drivers	sh: dma - convert sysdev_class to a regular subsystem	2011-12-21 15:09:52 -08:00
include	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
kernel	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
lib	sh: Ensure ST40-300 BogoMIPS value is consistent	2011-02-15 16:24:05 +09:00
lib64	Fix common misspellings	2011-03-31 11:26:23 -03:00
math-emu	perf: Remove the nmi parameter from the swevent and overflow interface	2011-07-01 11:06:35 +02:00
mm	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
oprofile	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
tools	sh: Add support for AP-SH4AD-0A board.	2011-01-13 18:36:21 +09:00
Kconfig	sh: kexec: Add PHYSICAL_START	2011-10-28 15:03:43 +09:00
Kconfig.cpu	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sh: Add default uImage rule for sh7757lcr	2011-11-01 16:01:12 +09:00