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
..
8xx	powerpc: remove non-required uses of include <linux/module.h>	2011-10-31 19:30:44 -04:00
40x	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
44x	powerpc: include export.h for files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:38 -04:00
52xx	Merge remote-tracking branch 'agust/next' into merge	2011-11-08 14:53:55 +11:00
82xx	powerpc/82xx: updates for mgcoge	2011-10-11 16:18:41 -05:00
83xx	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
85xx	powerpc/85xx: Fix compile error on p3060_qds.c	2011-11-23 22:55:47 -06:00
86xx	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
512x	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
amigaone	pcspkr: Cleanup Kconfig dependencies	2011-06-09 15:01:41 +02:00
cell	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
chrp	Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:12:10 -07:00
embedded6xx	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
iseries	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
maple	powerpc: add export.h to files making use of EXPORT_SYMBOL	2011-10-31 19:30:37 -04:00
pasemi	powerpc: various straight conversions from module.h --> export.h	2011-10-31 19:30:44 -04:00
powermac	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
powernv	powerpc/powernv: Handle PCI-X/PCIe reset delay	2011-09-20 16:12:54 +10:00
prep	powerpc: drop unused Kconfig symbols	2011-10-31 23:39:52 +01:00
ps3	powerpc/ps3: Fix SMP lockdep boot warning	2011-11-16 14:47:54 +11:00
pseries	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
wsp	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
fsl_uli1575.c
Kconfig	powerpc/fsl: MCU_MPC8349EMITX wants I2C built-in, modular won't do...	2011-11-16 14:25:19 +11:00
Kconfig.cputype	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
Makefile	powerpc: Add skeleton PowerNV platform	2011-09-20 15:53:25 +10:00