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

[coleen.phillimore at oracle.com]

Changeset: ed1cf3d234df
Author:    mockner
Date:      2015-05-14 14:03 -0400
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/ed1cf3d234df

6811960: x86 biasedlocking epoch expired rare bug
Summary: It is now guaranteed that biased_locking_enter will be passed a valid tmp_reg.
Reviewed-by: coleenp, dcubed, kvn

! src/cpu/x86/vm/interp_masm_x86.cpp
! src/cpu/x86/vm/macroAssembler_x86.cpp

Changeset: b587944c92e4
Author:    coleenp
Date:      2015-05-14 21:54 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/b587944c92e4

Merge