[commit: ghc] ghc-kinds: Merge branch 'master' into ghc-kinds (66cb069)

[Julien Cretin]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/66cb069d1bb75e203578aa18ccc912b6bf1cfd30

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

commit 66cb069d1bb75e203578aa18ccc912b6bf1cfd30
Merge: ba13cca... c27df60...
Author: Julien Cretin <ghc at ia0.eu>
Date:   Thu Sep 1 13:31:10 2011 +0200

    Merge branch 'master' into ghc-kinds
    
    Conflicts:
    	compiler/hsSyn/HsTypes.lhs
    	compiler/parser/RdrHsSyn.lhs
    	compiler/rename/RnEnv.lhs
    	compiler/rename/RnSource.lhs
    	compiler/typecheck/TcTyClsDecls.lhs

 compiler/hsSyn/HsBinds.lhs                 |   52 ++-
 compiler/hsSyn/HsDecls.lhs                 |   36 +-
 compiler/hsSyn/HsTypes.lhs                 |    7 +-
 compiler/nativeGen/RegAlloc/Graph/Spill.hs |  389 ++++++++-------
 compiler/nativeGen/X86/CodeGen.hs          |  107 +++--
 compiler/nativeGen/X86/Instr.hs            |  722 ++++++++++++++--------------
 compiler/nativeGen/X86/Ppr.hs              |  236 +++++-----
 compiler/nativeGen/X86/Regs.hs             |  292 ++++++------
 compiler/parser/Parser.y.pp                |    6 -
 compiler/parser/RdrHsSyn.lhs               |   31 +-
 compiler/rename/RnBinds.lhs                |   70 ++--
 compiler/rename/RnEnv.lhs                  |    8 +-
 compiler/rename/RnSource.lhs               |  214 ++++-----
 compiler/typecheck/TcBinds.lhs             |   16 +-
 compiler/typecheck/TcClassDcl.lhs          |   10 +-
 compiler/typecheck/TcInstDcls.lhs          |  345 ++++++--------
 compiler/typecheck/TcRnTypes.lhs           |   36 ++-
 compiler/typecheck/TcTyClsDecls.lhs        |   34 +-
 compiler/types/TyCon.lhs                   |   45 ++-
 docs/users_guide/glasgow_exts.xml          |  570 +++++++++++------------
 mk/build.mk.sample                         |    2 +
 mk/config.mk.in                            |   20 +-
 22 files changed, 1642 insertions(+), 1606 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 66cb069d1bb75e203578aa18ccc912b6bf1cfd30