[commit: ghc] wip/kavon-nosplit-llvm: Merge branch 'master' into wip/kavon-nosplit-llvm (6851111)

[git at git.haskell.org]

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

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/6851111def0361631a1e35630bb465c136112ce8/ghc

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

commit 6851111def0361631a1e35630bb465c136112ce8
Merge: 1ebe453 86abe0e
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Tue Jun 27 11:28:29 2017 +0100

    Merge branch 'master' into wip/kavon-nosplit-llvm



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6851111def0361631a1e35630bb465c136112ce8