[commit: ghc] cardinality: Merge branch 'master' into cardinality (9201a88)

[Ilya Sergey]

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

On branch  : cardinality

http://hackage.haskell.org/trac/ghc/changeset/9201a885242b36550be0ee3ff41d6a5aad0cf236

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

commit 9201a885242b36550be0ee3ff41d6a5aad0cf236
Merge: 39a868c... f61fbf3...
Author: Ilya Sergey <ilya.sergey at gmail.com>
Date:   Fri Jan 18 16:13:22 2013 +0400

    Merge branch 'master' into cardinality

 compiler/main/CmdLineParser.hs      |   10 +++++++
 compiler/main/DriverPipeline.hs     |    7 ++++-
 compiler/main/DynFlags.hs           |   47 ++++++++++++++++++-----------------
 includes/Rts.h                      |    1 +
 includes/rts/{Timer.h => GetTime.h} |   12 +++-----
 includes/rts/Utils.h                |    3 ++
 libraries/primitive                 |    1 +
 libraries/vector                    |    1 +
 rts/GetTime.h                       |    1 -
 rts/RtsUtils.c                      |    2 +-
 rts/RtsUtils.h                      |    3 --
 rts/Task.c                          |    9 ------
 rts/Task.h                          |    6 ----
 rts/sm/GCTDecl.h                    |    2 +-
 rts/sm/GCThread.h                   |    4 +++
 rts/sm/Storage.c                    |    7 +++++
 16 files changed, 64 insertions(+), 52 deletions(-)