[commit: ghc] wip/tc-plugins: Merge remote-tracking branch 'origin/master' into wip/tc-plugins (723e672)

[git at git.haskell.org]

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

On branch  : wip/tc-plugins
Link       : http://ghc.haskell.org/trac/ghc/changeset/723e6722040a1d476f0fdb9e7daddb821f2f90bc/ghc

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

commit 723e6722040a1d476f0fdb9e7daddb821f2f90bc
Merge: 1313ef8 8e66365
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Nov 9 15:04:35 2014 -0800

    Merge remote-tracking branch 'origin/master' into wip/tc-plugins
    
    Conflicts:
    	compiler/main/DynFlags.hs
    	compiler/simplCore/SimplCore.lhs
    	compiler/typecheck/Flattening-notes
    	compiler/typecheck/Inst.lhs
    	compiler/typecheck/TcBinds.lhs
    	compiler/typecheck/TcCanonical.lhs
    	compiler/typecheck/TcDeriv.lhs
    	compiler/typecheck/TcInstDcls.lhs
    	compiler/typecheck/TcInteract.lhs
    	compiler/typecheck/TcMType.lhs
    	compiler/typecheck/TcRnTypes.lhs
    	compiler/typecheck/TcSMonad.lhs
    	compiler/typecheck/TcSimplify.lhs
    	compiler/typecheck/TcType.lhs
    	compiler/types/FamInstEnv.lhs
    	rts/Linker.c
    	testsuite/tests/indexed-types/should_fail/ExtraTcsUntch.hs
    	testsuite/tests/indexed-types/should_fail/T1897b.stderr
    	testsuite/tests/indexed-types/should_fail/T2664.stderr
    	testsuite/tests/indexed-types/should_fail/T4093a.hs
    	testsuite/tests/indexed-types/should_fail/T7010.stderr
    	testsuite/tests/indexed-types/should_fail/T8518.stderr
    	testsuite/tests/perf/compiler/T5837.hs
    	testsuite/tests/simplCore/should_compile/T3772.stdout



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


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 723e6722040a1d476f0fdb9e7daddb821f2f90bc