Merge branches 'release', 'dmi', 'idle' and 'misc' into release
commitf60d63f642d824914677fb40330671117dc39c3b
authorLen Brown <len.brown@intel.com>
Thu, 14 Feb 2008 07:44:28 +0000 (14 02:44 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 14 Feb 2008 07:44:28 +0000 (14 02:44 -0500)
tree676aea14462e2c99eecef470b000dedff676e49b
parent46c1fbdb7191bf07979d7cd5f08d1a86458181a2
parentfe8e288a63f2f3c51c288500282d0eb5cd26a534
parent6bf69b5ebf22f8f5b4551bad688979fe29049126
Merge branches 'release', 'dmi', 'idle' and 'misc' into release
drivers/acpi/osl.c
drivers/acpi/processor_idle.c