[commit: ghc] master: Merge branch 'master' of git://git.haskell.org/ghc (c4ac3c9)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c4ac3c9d981e23a0bc1aa990414213f2049173c8/ghc

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

commit c4ac3c9d981e23a0bc1aa990414213f2049173c8
Merge: 74625d6 6188d0a
Author: Andreas Voellmy <andreas.voellmy at gmail.com>
Date:   Mon Mar 9 18:27:54 2015 -0400

    Merge branch 'master' of git://git.haskell.org/ghc



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

c4ac3c9d981e23a0bc1aa990414213f2049173c8
 compiler/cmm/CmmUtils.hs                      |   7 -
 compiler/main/DriverPipeline.hs               |  68 +++++-
 compiler/main/SysTools.hs                     |   9 +-
 compiler/utils/Digraph.hs                     | 308 ++++----------------------
 compiler/utils/Outputable.hs                  |   5 +
 libraries/process                             |   2 +-
 testsuite/tests/{annotations => hpc}/Makefile |   0
 testsuite/tests/hpc/T2991.hs                  |   5 +
 testsuite/tests/hpc/T2991LiterateModule.lhs   |   4 +
 testsuite/tests/hpc/all.T                     |  17 ++
 utils/hsc2hs                                  |   2 +-
 11 files changed, 149 insertions(+), 278 deletions(-)