]> git.hungrycats.org Git - linux/commitdiff
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/sn2defconfig
authorTony Luck <aegl@agluck-lia64.sc.intel.com>
Fri, 3 Sep 2004 05:46:43 +0000 (05:46 +0000)
committerTony Luck <aegl@agluck-lia64.sc.intel.com>
Fri, 3 Sep 2004 05:46:43 +0000 (05:46 +0000)
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

1  2 
arch/ia64/configs/sn2_defconfig

Simple merge