]> git.hungrycats.org Git - linux/commit
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/alex
authorTony Luck <aegl@agluck-lia64.sc.intel.com>
Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
committerTony Luck <aegl@agluck-lia64.sc.intel.com>
Wed, 22 Sep 2004 23:06:41 +0000 (23:06 +0000)
commit25e01e8c079e6652bf3f5098bc84b163de2e1899
tree60f685d7a245d4536ef7f57de0ffbafa0389a58b
parent8178ad77a50d761960599aaed4a43cc07a11ca15
parentb9987adaab42fe7035277bc921f5b8b1f6518aa5
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/alex
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9
arch/ia64/kernel/acpi.c
arch/ia64/mm/discontig.c
arch/ia64/pci/pci.c