[commit: ghc] wip/perf-testsuite: Merge commit 'ca19eaf4f1' into wip/test-testsuite (b843dc4)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/perf-testsuite
Link       : http://ghc.haskell.org/trac/ghc/changeset/b843dc40c9e6bf24b899f41af328e1a900c1eede/ghc

>---------------------------------------------------------------

commit b843dc40c9e6bf24b899f41af328e1a900c1eede
Merge: 7a32062 ca19eaf
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Tue Aug 22 17:35:06 2017 -0700

    Merge commit 'ca19eaf4f1' into wip/test-testsuite



>---------------------------------------------------------------

b843dc40c9e6bf24b899f41af328e1a900c1eede
 testsuite/driver/perf_notes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)