[commit: ghc] master: Merge branch 'master' of win:c:/m64/reg4/. (9782f8f)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9782f8fbf0d777840a5e65f71921186a7a193f16

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

commit 9782f8fbf0d777840a5e65f71921186a7a193f16
Merge: 47a0180... 1212145...
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Mar 23 23:19:01 2012 +0000

    Merge branch 'master' of win:c:/m64/reg4/.

 includes/Stg.h          |    8 ++++----
 includes/stg/MachRegs.h |    4 ++++
 rts/StgCRun.c           |   27 ++++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 9 deletions(-)