From 2607153b6785875ead46253bc513f86578c0fa53 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Fri, 9 Mar 2012 02:08:55 -0800
Subject: [PATCH] Merge branch 'master' of github.com:ucb-bar/riscv-rocket