[commit: ghc] ghc-lwc2: Merge branch 'master' into ghc-lwc2 (dfa1e88)

Fri Mar 1 06:58:43 CET 2013

Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-lwc2

http://hackage.haskell.org/trac/ghc/changeset/dfa1e88c00cb059eec1f771739205b52284ae8f8

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

commit dfa1e88c00cb059eec1f771739205b52284ae8f8
Merge: 9a077b3 e45f5e7
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Fri Mar 1 00:57:05 2013 -0500

    Merge branch 'master' into ghc-lwc2

 aclocal.m4                      |  2 +-
 compiler/main/DriverPipeline.hs | 77 ++++++++++++++++++++---------------------
 compiler/stgSyn/StgSyn.lhs      |  2 +-
 compiler/typecheck/TcDeriv.lhs  |  2 +-
 configure.ac                    |  9 ++++-
 rts/posix/OSThreads.c           |  4 ++-
 6 files changed, 52 insertions(+), 44 deletions(-)