hg: jdk9/hs-rt/hotspot: 3 new changesets

[thomas.schatzl at oracle.com]

Changeset: d7382190ab9d
Author:    goetz
Date:      2015-07-22 16:25 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/d7382190ab9d

8131761: Fix merge error adding code that was removed in 8077936
Reviewed-by: tschatzl

! src/share/vm/oops/oop.hpp
! src/share/vm/oops/oop.inline.hpp

Changeset: 51ba08cbefee
Author:    goetz
Date:      2015-07-22 16:25 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/51ba08cbefee

8130434: [TESTBUG] Harden TestLargePageUseForAuxMemory for more page size combinations
Reviewed-by: tschatzl

! test/gc/g1/TestLargePageUseForAuxMemory.java

Changeset: 080184153308
Author:    tschatzl
Date:      2015-07-22 16:46 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/080184153308

Merge