hg: hsx/hotspot-rt/hotspot: 2 new changesets

[coleen.phillimore at oracle.com]

Changeset: 96480359523a
Author:    coleenp
Date:      2013-03-11 14:00 -0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/96480359523a

8008965: @Contended fails with classes having static fields
Summary: Disable @Contended support for static fields
Reviewed-by: coleenp, kvn
Contributed-by: Aleksey Shipilev <aleksey.shipilev at oracle.com>

! src/share/vm/classfile/classFileParser.cpp
+ test/runtime/8003985/Test8003985.java

Changeset: d6320e955c89
Author:    coleenp
Date:      2013-03-13 13:47 -0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/d6320e955c89

Merge