[commit: ghc] wip/type-app: Merge remote-tracking branch 'origin/master' into wip/type-app (a97ef28)

[git at git.haskell.org]

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

On branch  : wip/type-app
Link       : http://ghc.haskell.org/trac/ghc/changeset/a97ef2812d5f61f9c5211eaefec9cf0796a964cc/ghc

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

commit a97ef2812d5f61f9c5211eaefec9cf0796a964cc
Merge: 556af58 64dba51
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Aug 6 12:55:12 2015 -0400

    Merge remote-tracking branch 'origin/master' into wip/type-app
    
    Conflicts:
    	compiler/iface/TcIface.hs
    	compiler/main/DynFlags.hs
    	compiler/typecheck/TcBinds.hs
    	compiler/typecheck/TcClassDcl.hs
    	compiler/typecheck/TcErrors.hs
    	compiler/typecheck/TcExpr.hs
    	compiler/typecheck/TcMType.hs
    	compiler/typecheck/TcPat.hs
    	compiler/typecheck/TcSMonad.hs
    	compiler/typecheck/TcType.hs
    	compiler/typecheck/TcValidity.hs
    	libraries/Cabal
    	testsuite/tests/ghci.debugger/scripts/break003.stderr
    	testsuite/tests/ghci.debugger/scripts/break006.stderr
    	testsuite/tests/ghci/scripts/Defer02.stderr
    	testsuite/tests/ghci/scripts/T2182ghci.stderr
    	testsuite/tests/ghci/scripts/T7730.stdout
    	testsuite/tests/ghci/scripts/ghci047.stderr
    	testsuite/tests/numeric/should_compile/T7116.stdout
    	testsuite/tests/parser/should_compile/all.T
    	testsuite/tests/partial-sigs/should_compile/T10403.stderr
    	testsuite/tests/partial-sigs/should_compile/T10438.stderr
    	testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr
    	testsuite/tests/partial-sigs/should_fail/Defaulting1MROff.stderr
    	testsuite/tests/partial-sigs/should_fail/TidyClash.stderr
    	testsuite/tests/partial-sigs/should_fail/Trac10045.stderr
    	testsuite/tests/partial-sigs/should_fail/WildcardInstantiations.stderr
    	testsuite/tests/partial-sigs/should_fail/WildcardsInPatternAndExprSig.stderr
    	testsuite/tests/patsyn/should_run/ghci.stdout
    	testsuite/tests/safeHaskell/ghci/p16.stderr
    	testsuite/tests/safeHaskell/ghci/p4.stderr
    	testsuite/tests/safeHaskell/ghci/p6.stderr
    	testsuite/tests/typecheck/should_compile/T10072.stderr
    	testsuite/tests/typecheck/should_compile/all.T
    	testsuite/tests/typecheck/should_fail/T10351.stderr
    	testsuite/tests/typecheck/should_fail/T6022.stderr
    	testsuite/tests/typecheck/should_fail/T8883.stderr
    	testsuite/tests/typecheck/should_fail/all.T
    	testsuite/tests/typecheck/should_fail/tcfail198.stderr



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


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 a97ef2812d5f61f9c5211eaefec9cf0796a964cc