Len Brown c602c65b2f Merge branch 'linus' into sfi-release ... Conflicts: arch/x86/kernel/setup.c drivers/acpi/power.c init/main.c Signed-off-by: Len Brown <len.brown@intel.com>		2009-09-19 00:11:26 -04:00
..
boot	Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-14 08:01:47 -07:00
configs
crypto	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-14 07:57:32 -07:00
ia32
include/asm	Merge branch 'linus' into sfi-release	2009-09-19 00:11:26 -04:00
kernel	Merge branch 'linus' into sfi-release	2009-09-19 00:11:26 -04:00
kvm	Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-09-14 17:43:43 -07:00
lguest	x86: Move get/set_wallclock to x86_platform_ops	2009-09-16 14:34:50 +02:00
lib	x86, msr: change msr-reg.o to obj-y, and export its symbols	2009-09-04 10:00:09 -07:00
math-emu
mm	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-17 20:58:11 -07:00
oprofile
pci	Merge branch 'linus' into sfi-release	2009-09-19 00:11:26 -04:00
power
vdso
video
xen	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-18 14:05:47 -07:00
Kbuild
Kconfig	Merge branch 'linus' into sfi-release	2009-09-19 00:11:26 -04:00
Kconfig.cpu
Kconfig.debug
Makefile	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-14 07:59:07 -07:00
Makefile_32.cpu