]> git.neil.brown.name Git - history.git/commitdiff
Merge http://ppc.bkbits.net/for-linus-ppc64
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 23 Jul 2002 13:21:07 +0000 (06:21 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 23 Jul 2002 13:21:07 +0000 (06:21 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
arch/ppc64/kernel/pSeries_lpar.c

Simple merge