[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (7fb4a5b)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7fb4a5bcefb77f15336fb173da099c4692919b8c

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

commit 7fb4a5bcefb77f15336fb173da099c4692919b8c
Merge: 3a266f1... 3fc546f...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jun 8 09:47:07 2012 +0100

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/codeGen/CgClosure.lhs    |    7 ++++---
 compiler/codeGen/ClosureInfo.lhs  |    2 +-
 compiler/codeGen/StgCmmBind.hs    |   17 ++++++++++-------
 compiler/codeGen/StgCmmClosure.hs |    2 +-
 ghc.mk                            |    4 ++--
 rts/Capability.c                  |   14 +++++++++-----
 rts/Capability.h                  |    2 +-
 rts/RaiseAsync.c                  |   10 ++++++++--
 rts/Schedule.c                    |   27 +++++++++++++++++++--------
 9 files changed, 55 insertions(+), 30 deletions(-)