From 0fd777f4807f1bf67d69fcbcac2a03aa14124da4 Mon Sep 17 00:00:00 2001
From: Huy Vo <huytbvo@berkeley.edu>
Date: Sun, 26 Feb 2012 17:24:23 -0800
Subject: [PATCH] Merge branch 'master' of github.com:ucb-bar/riscv-rocket