]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb4a8c3 ca4a698)
Merge intel.com:/home/lenb/bk/linux-2.6.8
authorLen Brown <len.brown@intel.com>
Thu, 5 Aug 2004 20:40:33 +0000 (16:40 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 5 Aug 2004 20:40:33 +0000 (16:40 -0400)
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

1  2 
arch/ia64/kernel/acpi.c patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/kernel/acpi.c
Simple merge
Linux kernels and configurations used by Zygo.