hg: jdk9/hs/hotspot: 2 new changesets

[thomas.schatzl at oracle.com]

Changeset: 60e088965ba0
Author:    tschatzl
Date:      2016-04-22 10:19 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/60e088965ba0

8154838: G1CardLiveData::free_large_bitmap() uses wrong calculation to determine the number of words
Summary: Use the exact same calculation as G1CardLiveData::allocate_large_bitmap() in free_large_bitmap().
Reviewed-by: stefank, jmasa

! src/share/vm/gc/g1/g1CardLiveData.cpp

Changeset: 156dd9902cf0
Author:    tschatzl
Date:      2016-04-22 13:43 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/156dd9902cf0

Merge