Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

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

Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)

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

Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
author Len Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
committer Len Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
diff --cc drivers/acpi/scan.c
Simple merge
diff --cc drivers/misc/acer-wmi.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
committer	Len Brown <len.brown@intel.com>
	Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
		1	2	3	4
drivers/acpi/scan.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/misc/acer-wmi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history