Merge branch 'bjorn-initcall-cleanup' into release

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

Sun, 5 Apr 2009 05:38:31 +0000 (01:38 -0400)

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

Sun, 5 Apr 2009 05:38:31 +0000 (01:38 -0400)
author Len Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:38:31 +0000 (01:38 -0400)
committer Len Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:38:31 +0000 (01:38 -0400)
diff --cc drivers/acpi/bus.c
Simple merge
diff --cc drivers/acpi/sleep.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Sun, 5 Apr 2009 05:38:31 +0000 (01:38 -0400)
committer	Len Brown <len.brown@intel.com>
	Sun, 5 Apr 2009 05:38:31 +0000 (01:38 -0400)
		1	2
drivers/acpi/bus.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	patch \|	diff1 \|	diff2 \|	blob \| history