[commit: ghc-prim] ghc-generics1's head updated: Merge remote-tracking branch 'origin/master' into ghc-generics1 (46c712b)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/ghc-prim

Branch 'ghc-generics1' now includes:

     5291677... Move the Word type from base to ghc-prim
     9530c56... Revert "Move Functor from base to ghc-prim"
     7e835c9... Move GHC.Generics from ghc-prim to base
     46c712b... Merge remote-tracking branch 'origin/master' into ghc-generics1