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
..
boot	doc: fix broken references	2011-09-27 18:08:04 +02:00
configs	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
crypto	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
ia32	Cross Memory Attach	2011-10-31 17:30:44 -07:00
include/asm	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
kvm	KVM: Don't automatically expose the TSC deadline timer in cpuid	2011-12-26 13:27:44 +02:00
lguest	lguest: add export.h to lguest files for THIS_MODULE/EXPORT_SYMBOL	2011-10-31 19:32:13 -04:00
lib	x86: Fix insn decoder for longer instruction	2011-10-10 09:05:51 +02:00
math-emu
mm	thp: add compound tail page _mapcount when mapped	2011-12-09 07:50:28 -08:00
net	net: bpf_jit: fix an off-one bug in x86_64 cond jump target	2011-12-19 15:47:29 -05:00
oprofile	Merge branch 'urgent' of git://amd64.org/linux/rric into perf/urgent	2011-11-15 11:03:30 +01:00
pci	x86: Fix files explicitly requiring export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:35 -04:00
platform	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
power	x86: Fix files explicitly requiring export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:35 -04:00
tools
um	fix braino in um patchset (mea culpa)	2011-11-21 12:10:21 -08:00
vdso	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-28 05:03:12 -07:00
video	x86: fix up files really needing to include module.h	2011-10-31 19:30:36 -04:00
xen	Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-12-15 10:52:40 -08:00
.gitignore
Kbuild	net: filter: Just In Time compiler for x86-64	2011-04-27 23:05:08 -07:00
Kconfig	x86/intel_mid: Kconfig select fix	2011-12-06 14:40:50 +01:00
Kconfig.cpu	x86: Add support for cmpxchg_double	2011-06-25 12:17:32 -07:00
Kconfig.debug	doc: fix broken references	2011-09-27 18:08:04 +02:00
Makefile
Makefile_32.cpu	x86, cpu: Move AMD Elan Kconfig under "Processor family"	2011-04-08 13:01:25 -07:00
Makefile.um	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01:00