Merge branch 'fluff' into release
commit33a8c927e423a205bcbbecdc43b451bad781a08e
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:20 +0000 (9 03:37 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:20 +0000 (9 03:37 -0500)
tree4ed692143eec382ba87872cc48e7162e06bd7465
parentb8ef914e58e90c3b4dba5f5bdd8ab04c45d3e008
parent8a383ef0be01e0e6e84c85f8bf35e4e6fcfb8981
Merge branch 'fluff' into release
drivers/acpi/ec.c