From: Adam Izraelevitz <adamiz@a5.Millennium.Berkeley.EDU>
Date: Tue, 11 Feb 2014 22:26:50 +0000 (-0800)
Subject: Merge branch 'master' of github.com:ucb-bar/riscv-tests
X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=commitdiff_plain;h=0c98ef833db1f6eead3bd9ad083d9408d2d8decb;hp=-c

Merge branch 'master' of github.com:ucb-bar/riscv-tests

Conflicts:
	README.md
---

0c98ef833db1f6eead3bd9ad083d9408d2d8decb