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

[tom.rodriguez at oracle.com]

Changeset: 754110e02bd5
Author:    never
Date:      2011-10-23 12:31 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot/rev/754110e02bd5

7103380: assertion failure with -XX:+PrintNativeNMethods
Reviewed-by: kvn, iveresov

! src/share/vm/asm/codeBuffer.cpp

Changeset: 42783d1414b2
Author:    never
Date:      2011-10-23 23:57 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot/rev/42783d1414b2

Merge

- make/templates/bsd-header