Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release

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

Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)

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

Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
author Len Brown <len.brown@intel.com>
Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
committer Len Brown <len.brown@intel.com>
Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
diff --cc drivers/acpi/ec.c
Simple merge
diff --cc drivers/acpi/sleep.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
committer	Len Brown <len.brown@intel.com>
	Wed, 2 Jun 2010 02:53:36 +0000 (22:53 -0400)
		1	2
drivers/acpi/ec.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	patch \|	diff1 \|	diff2 \|	blob \| history