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

[dimitris at microsoft.com]

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

On branch  : master

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

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

commit 7c185cd2525a20dcfa9859c5e6cf2f6300a19cc1
Merge: febf1ce... 173c408...
Author: Dimitrios Vytiniotis <dimitris at microsoft.com>
Date:   Thu May 19 09:56:56 2011 +0100

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

 includes/rts/EventLogFormat.h |   39 +++++++++++-
 rts/Capability.c              |    4 +
 rts/RtsProbes.d               |    6 ++
 rts/RtsStartup.c              |    4 +
 rts/Schedule.c                |   16 ++--
 rts/Trace.c                   |   67 ++++++++++++++++++
 rts/Trace.h                   |   69 +++++++++++++++++++
 rts/eventlog/EventLog.c       |  149 ++++++++++++++++++++++++++++++++++++++++-
 rts/eventlog/EventLog.h       |   29 ++++++++
 rts/ghc.mk                    |    1 +
 sync-all                      |    4 +
 11 files changed, 378 insertions(+), 10 deletions(-)