]> git.hungrycats.org Git - linux/commitdiff
Merge bk://ppc.bkbits.net/for-linus-ppc
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 11 Feb 2002 13:34:27 +0000 (05:34 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 11 Feb 2002 13:34:27 +0000 (05:34 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
include/asm-ppc/page.h

Simple merge