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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c96022cbfae44ea9180b78e3c37467613ac98cec

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

commit c96022cbfae44ea9180b78e3c37467613ac98cec
Merge: a30c2df... cea6307...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 13 15:51:44 2012 +0000

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

 .gitignore                              |    3 +
 compiler/llvmGen/LlvmCodeGen.hs         |    2 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs    |   16 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |   31 +-
 compiler/llvmGen/LlvmCodeGen/Regs.hs    |   13 +-
 compiler/main/DriverPipeline.hs         |   27 +-
 compiler/main/DynFlags.hs               |    6 +
 docs/users_guide/flags.xml              | 5610 ++++++++++++++++---------------
 ghc.mk                                  |  107 +-
 9 files changed, 2950 insertions(+), 2865 deletions(-)