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
..
clk	sh: clkfwk: Kill off remaining debugfs cruft.	2011-11-11 16:11:41 +09:00
intc	sh: intc - convert sysdev_class to a regular subsystem	2011-12-21 15:09:52 -08:00
maple	sh: Add module.h to arch/sh specific files as required.	2011-10-31 19:31:04 -04:00
superhyway	sh: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
Kconfig	sh: intc: Split up the INTC code.	2010-10-05 22:10:30 +09:00
Makefile	drivers: sh: Generalize runtime PM platform stub.	2011-11-11 15:41:50 +09:00
pfc.c	sh: pfc: Add GPIO IRQ support	2011-10-28 15:03:52 +09:00
pm_runtime.c	drivers: sh: Kill off dead pathname for runtime PM stub.	2011-11-11 15:58:50 +09:00