hg: ppc-aix-port/jdk8/hotspot: Fix some errors caused by the last sync with the staging repository (forgotten merge conflict markers)

[volker.simonis at gmail.com]

Changeset: 7bb61fd1ab88
Author:    simonis
Date:      2013-08-27 16:31 +0000
URL:       http://hg.openjdk.java.net/ppc-aix-port/jdk8/hotspot/rev/7bb61fd1ab88

Fix some errors caused by the last sync with the staging repository (forgotten merge conflict markers)

! src/os_cpu/linux_x86/vm/os_linux_x86.cpp
! src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp