hg: jdk7/hotspot-gc/hotspot: 2 new changesets

[jon.masamitsu at sun.com]

Changeset: ff004bcd2596
Author:    jmasa
Date:      2009-08-02 19:10 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/ff004bcd2596

6843292: "Expect to be beyond new region unless impacting another region" assertion too strong
Summary: In the assertion allow for collision with the guard page.
Reviewed-by: tonyp, ysr, jcoomes

! src/share/vm/memory/cardTableModRefBS.cpp

Changeset: 59726d16b30d
Author:    jmasa
Date:      2009-08-02 22:33 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/59726d16b30d

Merge