]> git.hungrycats.org Git - linux/commit
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/Linus
authorTony Luck <aegl@agluck-lia64.sc.intel.com>
Tue, 24 Aug 2004 16:28:11 +0000 (16:28 +0000)
committerTony Luck <aegl@agluck-lia64.sc.intel.com>
Tue, 24 Aug 2004 16:28:11 +0000 (16:28 +0000)
commit07df05a736993c9abc56157a381d97d06f3ad51b
treeaecb4021c5f52ad46e98b9a3c7526dc8ea5733f3
parent5a528e759df146b064f64a54bc05f709568166ca
parent65fd90f1492898e695a33ce4b164e02f157246e3
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/Linus
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9
include/asm-ia64/acpi.h