[commit: ghc] wip/orf-reboot: Merge remote-tracking branch 'origin/master' into wip/orf-reboot (f61ec3c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/f61ec3c82e265858ea0fe3fcdbd4dea07dec6061/ghc

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

commit f61ec3c82e265858ea0fe3fcdbd4dea07dec6061
Merge: 7f15a07 0a086c8
Author: Adam Gundry <adam at well-typed.com>
Date:   Mon Jun 15 17:02:20 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot
    
    Conflicts:
    	compiler/basicTypes/DataCon.hs-boot
    	compiler/basicTypes/RdrName.hs
    	compiler/hsSyn/HsTypes.hs
    	compiler/iface/MkIface.hs
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnNames.hs
    	compiler/rename/RnPat.hs
    	compiler/rename/RnTypes.hs
    	compiler/typecheck/TcRnMonad.hs
    	compiler/typecheck/TcRnTypes.hs
    	compiler/types/TyCon.hs
    	utils/haddock



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f61ec3c82e265858ea0fe3fcdbd4dea07dec6061