]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93756f8 40769c9)
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/trivial
authorTony Luck <aegl@agluck-lia64.sc.intel.com>
Wed, 8 Sep 2004 20:12:34 +0000 (20:12 +0000)
committerTony Luck <aegl@agluck-lia64.sc.intel.com>
Wed, 8 Sep 2004 20:12:34 +0000 (20:12 +0000)
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

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.