Merge branches 'release', 'misc' and 'misc-2.6.25' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:13:13 +0000 (03:13 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:13:13 +0000 (03:13 -0500)
commit70ec75c5b8e0bda7a16fb387f91e08545f379a0e
tree59a13092f566f89ce2cccbaecff487c82fc02564
parent4f4ae0d42680889c62db4e1f3e6b4aa7787a7257
parent2fdf07417e57136cf6baedf9508e2169a059ebea
parent23b168d425ca0ca25257ff8205a39f1c2d1b0f27
Merge branches 'release', 'misc' and 'misc-2.6.25' into release
arch/ia64/kernel/acpi.c
arch/x86/kernel/acpi/boot.c
drivers/acpi/osl.c
drivers/acpi/sleep/main.c