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

[david.holmes at oracle.com]

Changeset: 6c978a541c03
Author:    dholmes
Date:      2011-05-04 19:16 -0400
URL:       http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/6c978a541c03

7036267: c2/arm: mark version number as experimental and disable on unsupported platforms
Summary: Change call to Abstract_VM_Version::vm_info_string to VM_Version::vm_info_string so it cna be overridden by the arch specific VM_Version class
Reviewed-by: bobv, phh

! src/share/vm/runtime/arguments.cpp

Changeset: f49c31acee88
Author:    dholmes
Date:      2011-05-04 23:10 -0400
URL:       http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/f49c31acee88

Merge

- make/linux/makefiles/cscope.make
- make/solaris/makefiles/cscope.make