Thomas Gleixner 7acdbb3f35 Merge branch 'linus' into x86/platform ... Reason: Import mainline device tree changes on which further patches depend on or conflict. Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2011-02-23 09:21:41 +01:00
..
boot	x86: support XZ-compressed kernel	2011-01-13 08:03:25 -08:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2011-01-13 10:25:58 -08:00
ia32	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
include/asm	Merge branch 'linus' into x86/platform	2011-02-23 09:21:41 +01:00
kernel	Merge branch 'linus' into x86/platform	2011-02-23 09:21:41 +01:00
kvm	KVM: SVM: Make sure KERNEL_GS_BASE is valid when loading gs_index	2011-02-09 18:31:36 +02:00
lguest	LGUEST_GUEST: fix unmet direct dependencies (VIRTUALIZATION && VIRTIO)	2011-01-20 21:37:30 +10:30
lib	x86: udelay: Use this_cpu_read to avoid address calculation	2011-01-04 06:08:55 +01:00
math-emu	…
mm	x86, nx: Don't force pages RW when setting NX bits	2011-02-02 16:02:36 -08:00
oprofile	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-11 11:02:13 -08:00
pci	Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform	2011-02-22 18:41:48 +01:00
platform	Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform	2011-02-22 18:41:48 +01:00
power	x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states	2010-08-20 14:59:02 +02:00
tools	…
vdso	x86, gcc-4.6: Use gcc -m options when building vdso	2010-12-13 16:08:37 -08:00
video	…
xen	xen/setup: Route halt operations to safe_halt pvop.	2011-01-27 12:00:24 -05:00
.gitignore	…
Kbuild	x86: Add platform directory	2010-10-27 14:30:01 +02:00
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig.cpu	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig.debug	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Makefile	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-21 13:06:00 -07:00
Makefile_32.cpu	jump label: Add work around to i386 gcc asm goto bug	2010-10-29 14:45:29 -04:00