From 1c6f4e91f93886cb76775aafc0163a2f6221f2ef Mon Sep 17 00:00:00 2001
From: Yunsup Lee <yunsup@cs.berkeley.edu>
Date: Thu, 21 Nov 2013 15:02:40 -0800
Subject: [PATCH] merge origin/master, and push hwacha

---
 riscv-tools | 2 +-
 rocket      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/riscv-tools b/riscv-tools
index 3705cef8..e5307451 160000
--- a/riscv-tools
+++ b/riscv-tools
@@ -1 +1 @@
-Subproject commit 3705cef8590cea7624749755f2740cda66a8aeae
+Subproject commit e5307451589e339c56e54e869bdb1d74c6cb8e90
diff --git a/rocket b/rocket
index 9b0b6a1d..b0ac6926 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 9b0b6a1dc914b60d8a832664e4e9ead43646f38e
+Subproject commit b0ac69269508a78babd4f79c824dbd9d5fec030e