# HG changeset patch
# User kbarrett
# Date 1429634979 0
# Node ID 1b77a431c3747cde82b5477180477201fb6a1d42
# Parent  b336f5ecd540934a7093b129811332188150a6e9# Parent  41fef3a62cc8fb54b605884193103250bbbb0f32
Merge

diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/g1/g1Allocator.cpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/shared/plab.cpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/shared/plab.hpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/gc_implementation/shared/plab.inline.hpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/precompiled/precompiled.hpp
diff -r b336f5ecd540 -r 1b77a431c374 hotspot/src/share/vm/runtime/globals.hpp