Manual merge fixup
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 22 May 2002 07:04:43 +0000 (00:04 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 22 May 2002 07:04:43 +0000 (00:04 -0700)
commit9d912132e3359f245033a47b5c7893321bd333c9
tree2fd0357766597571a6de20813b20ccda7bafd0cb
parentd33fb4fe8ea2a6e351ad9af2c7e959a5eb2c36f0
parentdee4f8ff93b94fc3c2c9feab3f650949f09dbaca
Manual merge fixup
arch/m68k/mm/init.c