[commit: ghc] wip/llf: Merge branch 'master' into late-lam-lift (b1c7047)

[git at git.haskell.org]

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

On branch  : wip/llf
Link       : http://ghc.haskell.org/trac/ghc/changeset/b1c704728cafd2609c4e799240cfd069e0d306bb/ghc

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

commit b1c704728cafd2609c4e799240cfd069e0d306bb
Merge: 8d979a1 1a11e9b
Author: Nicolas Frisby <nicolas.frisby at gmail.com>
Date:   Sun Jun 15 20:16:23 2014 -0500

    Merge branch 'master' into late-lam-lift
    
    It seems to be building, but I haven't tested it yet -- just now
    commiting before I run validate.sh
    
    Conflicts:
    	compiler/basicTypes/VarEnv.lhs
    	compiler/codeGen/StgCmmArgRep.hs
    	compiler/codeGen/StgCmmHeap.hs
    	compiler/coreSyn/CorePrep.lhs
    	compiler/coreSyn/CoreUnfold.lhs
    	compiler/main/DynFlags.hs
    	compiler/main/StaticFlags.hs
    	compiler/simplCore/SetLevels.lhs
    	compiler/simplCore/SimplCore.lhs
    	compiler/specialise/SpecConstr.lhs
    	compiler/stgSyn/CoreToStg.lhs
    	compiler/stranal/WwLib.lhs
    	includes/Cmm.h
    	rts/Linker.c



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


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 b1c704728cafd2609c4e799240cfd069e0d306bb