# HG changeset patch
# User asaha
# Date 1414794164 25200
# Node ID d961743b78976a06467a879b1f48bbd8877958fa
# Parent  c2844108a7085f7ed4a7450da08d0b7865e44dab# Parent  e9f815c3f21cf2febd8e3c185917c1519aa52d9a
Merge

diff -r c2844108a708 -r d961743b7897 .hgtags
--- a/.hgtags	Thu Oct 23 12:02:08 2014 -0700
+++ b/.hgtags	Fri Oct 31 15:22:44 2014 -0700
@@ -553,6 +553,7 @@
 401cbaa475b4efe53153119ab87a82b217980a7f jdk8u31-b03
 060cdf93040c1bfa5fdf580da5e9999042632cc8 jdk8u31-b04
 6e56d7f1634f6c4cd4196e699c06e6ca2e6d6efb jdk8u31-b05
+271a32147391d08b0f338d9353330e2b5584d580 jdk8u31-b06
 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
diff -r c2844108a708 -r d961743b7897 make/hotspot_version
diff -r c2844108a708 -r d961743b7897 src/cpu/sparc/vm/sparc.ad