tree f1f833c8dd6c1519eeb101be32f7fe54a9605af5
parent 3834f47291df475be3f0f0fb7ccaa098967cc054
parent 78f28b7c555359c67c2a0d23f7436e915329421e
author Len Brown <len.brown@intel.com> 1253333486 -0400
committer Len Brown <len.brown@intel.com> 1253333486 -0400

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>