Merge branch 'master' into trigger
authorTim Newsome <tim@sifive.com>
Fri, 2 Sep 2016 20:28:14 +0000 (13:28 -0700)
committerTim Newsome <tim@sifive.com>
Fri, 2 Sep 2016 20:28:14 +0000 (13:28 -0700)
commitd49dd8b60eb1809ecc7b42e0fb615d64402aa47f
treee6c0ef436cb7d679e82f118a2acd8bbaf113c741
parent2b390a9dea7435c5e83c11433c05e136ad9b163a
parent10d1bff0a1612685d08906a33b7eb87223f9d1c3
Merge branch 'master' into trigger

Conflicts:
riscv/encoding.h
riscv/processor.cc
riscv/processor.cc
riscv/processor.h