[commit: ghc] master: Merge remote-tracking branch 'origin/master' (aca4fde)

[Simon Peyton Jones]

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

On branch  : master

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

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

commit aca4fde66f74bdb882e9151cd65ef8092246def1
Merge: e79e580... ac51be0...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed May 4 12:14:27 2011 +0100

    Merge remote-tracking branch 'origin/master'

 compiler/nativeGen/AsmCodeGen.lhs |   38 +++++++++++++++++++++---------------
 compiler/nativeGen/X86/Instr.hs   |    2 +-
 compiler/nativeGen/X86/Regs.hs    |   22 +++++++++++++++++---
 mk/build.mk.sample                |    9 --------
 4 files changed, 41 insertions(+), 30 deletions(-)