]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'release', 'dmi', 'idle' and 'misc' into release
authorLen Brown <len.brown@intel.com>
Thu, 14 Feb 2008 07:44:28 +0000 (02:44 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 14 Feb 2008 07:44:28 +0000 (02:44 -0500)
1  2  3 
drivers/acpi/osl.c
drivers/acpi/processor_idle.c

Simple merge
Simple merge