# HG changeset patch
# User tschatzl
# Date 1407856666 0
# Node ID bfba6779654bb7a53b74220a13cc9b9c7ecfe492
# Parent  c3c9eee55fce26efc26d64808429ac0dcd64bcf9# Parent  a08bb8e45ba185772b8132a1aac38d546a86508e
Merge

diff -r c3c9eee55fce -r bfba6779654b src/share/vm/gc_implementation/g1/concurrentMark.cpp
diff -r c3c9eee55fce -r bfba6779654b src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
diff -r c3c9eee55fce -r bfba6779654b src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
diff -r c3c9eee55fce -r bfba6779654b src/share/vm/gc_implementation/g1/g1_globals.hpp