]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb74564 65fd90f)
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.9
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 Aug 2004 09:59:41 +0000 (02:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 Aug 2004 09:59:41 +0000 (02:59 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
include/asm-ia64/acpi.h patch | diff1 | diff2 | blob | history

diff --cc include/asm-ia64/acpi.h
Simple merge
Linux kernels and configurations used by Zygo.