[commit: ghc] wip/rae-new-coercible: Merge remote-tracking branch 'origin/master' into wip/rae-new-coercible (ed2aed8)

[git at git.haskell.org]

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

On branch  : wip/rae-new-coercible
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed2aed88bfff9e1ac9f78211f9cc88424f1e828b/ghc

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

commit ed2aed88bfff9e1ac9f78211f9cc88424f1e828b
Merge: c336539 030ece4
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sun Dec 7 14:47:44 2014 -0500

    Merge remote-tracking branch 'origin/master' into wip/rae-new-coercible



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

ed2aed88bfff9e1ac9f78211f9cc88424f1e828b
 compiler/coreSyn/TrieMap.hs                        |   7 +
 compiler/main/CmdLineParser.hs                     |  12 --
 compiler/main/DynFlags.hs                          |  31 ++--
 compiler/rename/RnEnv.hs                           |  12 +-
 compiler/typecheck/Flattening-notes                | 181 +++++++++++++++++++++
 compiler/typecheck/TcInteract.hs                   |  47 ++++--
 compiler/types/Unify.hs                            |  15 +-
 docs/users_guide/7.10.1-notes.xml                  |   6 +-
 docs/users_guide/flags.xml                         |   7 +
 docs/users_guide/using.xml                         |  56 +++++--
 includes/rts/Linker.h                              |   3 +
 libraries/Cabal                                    |   2 +-
 libraries/base/Data/Either.hs                      |   6 +-
 libraries/base/Data/Foldable.hs                    |  40 +++--
 libraries/base/Data/Traversable.hs                 |  23 ++-
 libraries/base/Data/Type/Bool.hs                   |  30 ++--
 libraries/base/Data/Type/Equality.hs               |  34 ++--
 libraries/base/Foreign/Marshal/Alloc.hs            |  18 ++
 libraries/base/Foreign/Marshal/Array.hs            |  19 ++-
 libraries/base/GHC/TypeLits.hs                     |  10 +-
 libraries/base/System/Posix/Internals.hs           |   2 +-
 libraries/base/changelog.md                        |   4 +
 libraries/unix                                     |   2 +-
 rts/CheckUnload.c                                  |   4 +
 rts/Linker.c                                       | 179 +++++++++++++-------
 rts/LinkerInternals.h                              |   4 +
 rules/distdir-opts.mk                              |   1 +
 testsuite/tests/cabal/cabal06/Makefile             |   4 +-
 testsuite/tests/rename/should_compile/T9778.hs     |   8 +
 testsuite/tests/rename/should_compile/T9778.stderr |   3 +
 testsuite/tests/rename/should_compile/all.T        |   1 +
 testsuite/tests/rts/Makefile                       |   8 +-
 testsuite/tests/rts/T2615.hs                       |   1 +
 testsuite/tests/rts/all.T                          |   1 +
 testsuite/tests/rts/linker_unload.c                |  37 +++++
 testsuite/tests/rts/linker_unload.stdout           |   2 +-
 testsuite/tests/rts/rdynamic.hs                    |   2 +
 37 files changed, 637 insertions(+), 185 deletions(-)