Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ... Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-31 09:45:46 +02:00
..
boot
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
crypto
ia32	Mark arguments to certain syscalls as being const	2010-08-13 16:53:13 -07:00
include/asm	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
kernel	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
kvm	Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-08-22 11:27:36 -07:00
lguest
lib	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-13 10:35:48 -07:00
math-emu
mm	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
oprofile
pci
power	x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states	2010-08-20 14:59:02 +02:00
tools
vdso	Merge branches 'x86-cleanups-for-linus', 'x86-vmware-for-linus', 'x86-mtrr-for-linus', 'x86-apic-for-linus', 'x86-fpu-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 16:22:59 -07:00
video
xen	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
.gitignore
Kbuild
Kconfig	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
Kconfig.cpu
Kconfig.debug
Makefile
Makefile_32.cpu