Merge branch 'misc' into next

author Len Brown <len.brown@intel.com>

Tue, 2 Oct 2012 04:15:17 +0000 (00:15 -0400)

committer Len Brown <len.brown@intel.com>

Tue, 2 Oct 2012 04:15:17 +0000 (00:15 -0400)
author Len Brown <len.brown@intel.com>
Tue, 2 Oct 2012 04:15:17 +0000 (00:15 -0400)
committer Len Brown <len.brown@intel.com>
Tue, 2 Oct 2012 04:15:17 +0000 (00:15 -0400)
diff --cc drivers/acpi/scan.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
author	Len Brown <len.brown@intel.com>
	Tue, 2 Oct 2012 04:15:17 +0000 (00:15 -0400)
committer	Len Brown <len.brown@intel.com>
	Tue, 2 Oct 2012 04:15:17 +0000 (00:15 -0400)
		1	2
drivers/acpi/scan.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	patch \|	diff1 \|	diff2 \|	blob \| history