]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 488b5ec ad3399c 7c2670b)
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:07:03 +0000 (03:07 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:07:03 +0000 (03:07 -0500)
1  2  3 
drivers/acpi/sleep/main.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/acpi/sleep/main.c
Simple merge
Linux 2.6 source tree