]> git.hungrycats.org Git - linux/commitdiff
Merge http://lia64.bkbits.net/to-linus-2.5
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 Feb 2004 04:02:46 +0000 (20:02 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 Feb 2004 04:02:46 +0000 (20:02 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux

1  2 
include/asm-ia64/tlb.h

Simple merge