Fixup bad merge.
authorDavid Mosberger <davidm@wailua.hpl.hp.com>
Sat, 9 Mar 2002 07:19:01 +0000 (23:19 -0800)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Sat, 9 Mar 2002 07:19:01 +0000 (23:19 -0800)
commitb59b47cd09cd66cae055c944a45623a8df1b0990
tree519ac832932a6f8ae8dc5bdc1dcff50f2fce8814
parent8e4a8959696c516703ddfefa278470be8ec1aca2
Fixup bad merge.
arch/ia64/kernel/perfmon.c