[commit: packages/deepseq] master: Merge PR #28 (ded7a22)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/deepseq.git/commitdiff/ded7a2282271ceae8988f7f46753b69d593df84e

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

commit ded7a2282271ceae8988f7f46753b69d593df84e
Merge: 36f6a84 0792252
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Apr 16 09:10:27 2017 +0200

    Merge PR #28



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

ded7a2282271ceae8988f7f46753b69d593df84e
 Control/DeepSeq.hs | 4 ++--
 changelog.md       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc changelog.md
index e75d8ad,dc66b87..83f9997
--- a/changelog.md
+++ b/changelog.md
@@@ -13,10 -13,7 +13,11 @@@
      ([#13](https://github.com/haskell/deepseq/issues/13))
    * Add `NFData Ordering` ([#25](https://github.com/haskell/deepseq/pull/25))
    * Add `NFData1` and `NFData2` type classes ([#8](https://github.com/haskell/deepseq/issues/8))
 +  * Add `NFData1` and `NFData` instances for `Data.Functor.{Compose,Sum,Product}`
 +    ([#30](https://github.com/haskell/deepseq/pull/30))
 +  * Add `NFData` instance for `Foreign.C.Types.CBool`
 +  * Drop support for GHC 7.0 & GHC 7.2
+   * Expose `NFData` instance for `Down` on earlier versions of `base`
  
  ## 1.4.2.0  *Apr 2016*