[commit: ghc] wip/type-app: Merge remote-tracking branch 'origin/master' into wip/type-app (cb50691)

[git at git.haskell.org]

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

On branch  : wip/type-app
Link       : http://ghc.haskell.org/trac/ghc/changeset/cb506915005222cf25c80267569a4531a62b7374/ghc

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

commit cb506915005222cf25c80267569a4531a62b7374
Merge: a97ef28 bc43d23
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Aug 6 16:02:31 2015 -0400

    Merge remote-tracking branch 'origin/master' into wip/type-app



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

cb506915005222cf25c80267569a4531a62b7374
 compiler/llvmGen/LlvmMangler.hs                    | 183 +++++++++------------
 compiler/main/DynFlags.hs                          |  36 +++-
 compiler/main/GHC.hs                               |  27 +--
 libraries/base/Control/Applicative.hs              |   3 +-
 libraries/base/Data/Complex.hs                     |  16 +-
 libraries/base/Data/Functor/Identity.hs            |   3 +-
 libraries/base/Foreign/Storable.hs                 |   6 +
 libraries/base/changelog.md                        |   9 +-
 rts/posix/OSMem.c                                  |  59 +++----
 testsuite/tests/driver/{T8101.hs => T8101b.hs}     |   0
 .../tests/driver/{T8101.stderr => T8101b.stderr}   |   2 +-
 testsuite/tests/driver/all.T                       |   2 +
 testsuite/tests/ghc-api/T10052/T10052.stderr       |   2 +-
 .../tests/ghci.debugger/scripts/print007.stderr    |   5 +-
 .../should_compile => ghci/should_fail}/Makefile   |   0
 testsuite/tests/ghci/should_fail/T10549.hs         |  15 ++
 testsuite/tests/ghci/should_fail/T10549.script     |   1 +
 .../should_fail/T10549.stderr}                     |   2 +-
 testsuite/tests/ghci/should_fail/all.T             |   3 +
 19 files changed, 208 insertions(+), 166 deletions(-)