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

[git at git.haskell.org]

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

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

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

commit f17ceee98221de21f896ac412b7a7ddcfc35a0c6
Merge: 4d3f37e 15faa0e
Author: Nicolas Frisby <nicolas.frisby at gmail.com>
Date:   Tue Aug 19 20:03:23 2014 -0500

    Merge branch 'master' into late-lam-lift
    
    Silly conflicts because of new flags -- not sure how best to resolve/avoid this.
    
    git is requiring my commit to mention 'submodule' for some reason?
    
    Conflicts:
    	compiler/main/DynFlags.hs



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


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 f17ceee98221de21f896ac412b7a7ddcfc35a0c6