]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8976b6f 443dea7)
Merge branches 'release' and 'hwmon-conflicts' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)
1  2 
drivers/acpi/osl.c patch | diff1 | diff2 | blob | history
include/acpi/acpiosxf.h patch | diff1 | diff2 | blob | history
include/linux/acpi.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/osl.c
Simple merge
diff --cc include/acpi/acpiosxf.h
Simple merge
diff --cc include/linux/acpi.h
Simple merge
Linux 2.6 source tree