]> git.neil.brown.name Git - history.git/commit
Merge ia64 conflicts
authorLinus Torvalds <torvalds@home.osdl.org>
Mon, 29 Dec 2003 14:09:43 +0000 (06:09 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Mon, 29 Dec 2003 14:09:43 +0000 (06:09 -0800)
commite56b865f202897f2dbdc173a6e4a0719f6b5a564
treec76c063a6f1c8623502fc62a3b96ad12b5193c92
parent3a450ae439727ef6a091345394448a80b0e78e50
parent5069356cefe907402c94c8f1e199f2c6447fed3c
Merge ia64 conflicts
arch/ia64/Kconfig
arch/ia64/kernel/irq.c
arch/ia64/mm/hugetlbpage.c