[commit: ghc] wip/nfs-locking: Merge branch 'master' of https://github.com/ndmitchell/shaking-up-ghc (f98836e)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/f98836ec1bae9809c167277232e0629647af1145/ghc

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

commit f98836ec1bae9809c167277232e0629647af1145
Merge: e40e2e0 cbbbc63
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Wed Feb 17 16:25:50 2016 +0000

    Merge branch 'master' of https://github.com/ndmitchell/shaking-up-ghc



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

f98836ec1bae9809c167277232e0629647af1145
 src/Base.hs           | 12 +++++-------
 src/Rules.hs          |  2 ++
 src/Rules/Library.hs  | 19 +++++++++++--------
 src/Rules/Register.hs |  9 ++-------
 src/Rules/Selftest.hs | 45 +++++++++++++++++++++++++++++++++++++--------
 5 files changed, 57 insertions(+), 30 deletions(-)