Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
authorPatrick Palka <patrick@parcs.ath.cx>
Mon, 9 Sep 2013 02:10:50 +0000 (22:10 -0400)
committerPatrick Palka <patrick@parcs.ath.cx>
Mon, 9 Sep 2013 02:10:50 +0000 (22:10 -0400)
commit783ca393d9b262fe0efc6308e71c95a2da0eda1a
treed515913f550abc335500613a02c1311d6e12e341
parenta58ba1856451447350132f20637deb898ebee252
parent2cec084e45392e0b0d198254017b140accee32f0
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
compiler/main/DynFlags.hs
rts/PrimOps.cmm