Tweaks per Maynard's comments; POWER5 isn't in the HEAD branch yet.
Tweaks per Maynard's comments; POWER5 isn't in the HEAD branch yet.

arm-hpc/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi