[commit: ghc] cardinality: Merge branch 'master' into cardinality (0f1d940)

[Ilya Sergey]

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

On branch  : cardinality

http://hackage.haskell.org/trac/ghc/changeset/0f1d94016a94da2a373df95586cd6fcbf7bdd5d4

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

commit 0f1d94016a94da2a373df95586cd6fcbf7bdd5d4
Merge: 92043de... 3e1745a...
Author: Ilya Sergey <ilya.sergey at gmail.com>
Date:   Thu Jan 31 01:33:51 2013 +0400

    Merge branch 'master' into cardinality

 aclocal.m4                          |   33 +++++++++++++++++++++++++++++++--
 compiler/basicTypes/MkId.lhs        |    2 +-
 compiler/basicTypes/SrcLoc.lhs      |    4 ++--
 compiler/basicTypes/Var.lhs         |    2 +-
 compiler/coreSyn/CoreArity.lhs      |    2 +-
 compiler/coreSyn/CoreLint.lhs       |    2 +-
 compiler/coreSyn/CoreSubst.lhs      |    4 ++--
 compiler/coreSyn/CoreUtils.lhs      |    2 +-
 compiler/deSugar/Desugar.lhs        |    2 +-
 compiler/deSugar/DsBinds.lhs        |    4 ++--
 compiler/deSugar/DsExpr.lhs         |    2 +-
 compiler/deSugar/DsMeta.hs          |    6 +++---
 compiler/deSugar/DsUtils.lhs        |    2 +-
 compiler/deSugar/MatchLit.lhs       |    2 +-
 compiler/iface/IfaceSyn.lhs         |    2 +-
 compiler/main/TidyPgm.lhs           |    4 ++--
 compiler/nativeGen/X86/CodeGen.hs   |    2 +-
 compiler/prelude/TysPrim.lhs        |    4 ++--
 compiler/rename/RnEnv.lhs           |    2 +-
 compiler/rename/RnExpr.lhs          |    2 +-
 compiler/rename/RnNames.lhs         |    4 ++--
 compiler/simplCore/LiberateCase.lhs |    2 +-
 compiler/simplCore/SimplCore.lhs    |    2 +-
 compiler/simplCore/SimplEnv.lhs     |    2 +-
 compiler/simplCore/SimplUtils.lhs   |    4 ++--
 compiler/simplCore/Simplify.lhs     |    6 +++---
 compiler/specialise/SpecConstr.lhs  |    4 ++--
 compiler/specialise/Specialise.lhs  |    2 +-
 compiler/stgSyn/StgLint.lhs         |    2 +-
 compiler/typecheck/TcErrors.lhs     |    4 ++--
 compiler/typecheck/TcExpr.lhs       |    2 +-
 compiler/typecheck/TcGenDeriv.lhs   |    4 ++--
 compiler/typecheck/TcHsSyn.lhs      |    2 +-
 compiler/typecheck/TcHsType.lhs     |    2 +-
 compiler/typecheck/TcInstDcls.lhs   |    6 +++---
 compiler/typecheck/TcInteract.lhs   |    2 +-
 compiler/typecheck/TcPat.lhs        |    4 ++--
 compiler/typecheck/TcRnDriver.lhs   |    2 +-
 compiler/typecheck/TcRnTypes.lhs    |    2 +-
 compiler/typecheck/TcSimplify.lhs   |    2 +-
 compiler/typecheck/TcSplice.lhs     |    4 ++--
 compiler/typecheck/TcTyClsDecls.lhs |    4 ++--
 compiler/typecheck/TcUnify.lhs      |    2 +-
 compiler/types/OptCoercion.lhs      |    4 ++--
 compiler/types/TyCon.lhs            |    2 +-
 compiler/types/TypeRep.lhs          |    2 +-
 configure.ac                        |   13 -------------
 distrib/configure.ac.in             |    7 ++-----
 docs/storage-mgt/rp.tex             |    2 +-
 includes/rts/Ticky.h                |    2 +-
 includes/stg/HaskellMachRegs.h      |    2 +-
 includes/stg/MachRegs.h             |   15 +++++++++++++++
 includes/stg/RtsMachRegs.h          |    2 +-
 utils/genapply/GenApply.hs          |    2 +-
 54 files changed, 118 insertions(+), 90 deletions(-)