Pull fluff into release branch
authorLen Brown <len.brown@intel.com>
Tue, 20 Nov 2007 06:21:47 +0000 (01:21 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 20 Nov 2007 06:21:47 +0000 (01:21 -0500)
Conflicts:

drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge