From: Simon Marlow Date: Mon, 23 May 2011 09:24:53 +0000 (+0100) Subject: Merge branch 'master' of /home/simonmar/ghc-git/. X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=5e0059a9fd797d550aa7dd856a14c12eb0914578 Merge branch 'master' of /home/simonmar/ghc-git/. * 'master' of /home/simonmar/ghc-git/.: Revert "Add capability sets to the event system. Contains code from Duncan Coutts." --- 5e0059a9fd797d550aa7dd856a14c12eb0914578