]> git.hungrycats.org Git - linux/commitdiff
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/Linus
authorTony Luck <aegl@agluck-lia64.sc.intel.com>
Thu, 16 Sep 2004 20:26:04 +0000 (20:26 +0000)
committerTony Luck <aegl@agluck-lia64.sc.intel.com>
Thu, 16 Sep 2004 20:26:04 +0000 (20:26 +0000)
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

1  2 
arch/ia64/Kconfig

Simple merge