]> git.hungrycats.org Git - linux/commitdiff
Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5
authorDavid Mosberger <davidm@tiger.hpl.hp.com>
Fri, 24 May 2002 16:22:48 +0000 (09:22 -0700)
committerDavid Mosberger <davidm@tiger.hpl.hp.com>
Fri, 24 May 2002 16:22:48 +0000 (09:22 -0700)
into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

1  2 
arch/ia64/mm/init.c

Simple merge