Sync up with Linus's tree and resolve conflicts in perfmon.c.
authorDavid Mosberger <davidm@wailua.hpl.hp.com>
Sat, 9 Mar 2002 05:49:33 +0000 (21:49 -0800)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Sat, 9 Mar 2002 05:49:33 +0000 (21:49 -0800)
commit8e4a8959696c516703ddfefa278470be8ec1aca2
tree5b6c88223cb313cdde6a7dd8ebe75cd62d000692
parentc39e9205e9c097cfa94117a2e452957d2ce03c9e
parent5bedd81bebe867bef34a42284d291a787f1fd02f
Sync up with Linus's tree and resolve conflicts in perfmon.c.
Makefile
arch/ia64/kernel/perfmon.c
include/linux/mm.h