]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cbe400 3a464ad)
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0
authorLen Brown <len.brown@intel.com>
Mon, 26 Jan 2004 12:16:11 +0000 (07:16 -0500)
committerLen Brown <len.brown@intel.com>
Mon, 26 Jan 2004 12:16:11 +0000 (07:16 -0500)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.1

1  2 
drivers/acpi/osl.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/osl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.