hg: jdk7u/jdk7u/hotspot: 2 new changesets

[abhi.saha at oracle.com]

Changeset: 50f489feeb5e
Author:    asaha
Date:      2014-01-15 10:45 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot/rev/50f489feeb5e

8031787: Remove fix JDK-8026887 from 7u60
Summary: Backed out changeset f673c581ebf9
Reviewed-by: coffeys

! src/os/linux/vm/os_linux.cpp
! src/os/linux/vm/os_linux.hpp
! src/share/vm/utilities/vmError.cpp

Changeset: 2c971ed884ce
Author:    asaha
Date:      2014-01-15 10:53 -0800
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot/rev/2c971ed884ce

Merge

! src/os/linux/vm/os_linux.cpp
! src/os/linux/vm/os_linux.hpp
! src/share/vm/utilities/vmError.cpp