[commit: ghc] wip/nfs-locking: Merge pull request #161 from ndmitchell/master (f5f6c41)

[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/f5f6c41b98c7f4682f0bd73f573fc170e233235a/ghc

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

commit f5f6c41b98c7f4682f0bd73f573fc170e233235a
Merge: 57c6497 8f995f6
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 12 22:46:47 2016 +0000

    Merge pull request #161 from ndmitchell/master
    
    Cleanups in libffi



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

f5f6c41b98c7f4682f0bd73f573fc170e233235a
 src/Rules/Actions.hs |  7 ++++++-
 src/Rules/Libffi.hs  | 16 +++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)