[commit: ghc] master: Merge branch 'master' of mac:ghc/git/val32/. (6f3be2b)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6f3be2b6ea39ee28d6cf8da08effb5dd215c92f2

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

commit 6f3be2b6ea39ee28d6cf8da08effb5dd215c92f2
Merge: 041e832... c38794d...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Sep 14 13:58:17 2012 +0100

    Merge branch 'master' of mac:ghc/git/val32/.

 rts/Disassembler.c        |    2 +-
 rts/GetTime.h             |    2 +-
 rts/Linker.c              |    4 ++--
 rts/Printer.c             |   14 +++++++-------
 rts/RtsFlags.c            |    2 +-
 rts/Stats.c               |   12 ++++++------
 rts/Trace.c               |   26 +++++++++++++-------------
 rts/hooks/MallocFail.c    |    2 +-
 rts/hooks/OutOfHeap.c     |    2 +-
 rts/hooks/StackOverflow.c |    2 +-
 rts/posix/GetTime.c       |    2 +-
 rts/posix/OSMem.c         |    4 ++--
 rts/sm/Sanity.c           |   16 ++++++++--------
 rts/win32/GetTime.c       |    2 +-
 14 files changed, 46 insertions(+), 46 deletions(-)