[commit: ghc] ghc-7.10: Revert merges since ghc-7.10.2-release (7b274b0)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/7b274b072cd94606a584ce644c4c9685aa6a017a/ghc

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

commit 7b274b072cd94606a584ce644c4c9685aa6a017a
Merge: 0da488c 354c568
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Oct 22 10:20:53 2015 +0200

    Revert merges since ghc-7.10.2-release
    
    These commits were pushed hastily with insufficient testing. There were
    significant validation issues. For the sake of clarity of history let's
    just start from scratch.



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

7b274b072cd94606a584ce644c4c9685aa6a017a