tree f822a4fa9f72a901a40eda4a12dc0055ff8f6266
parent 934f98d7e8123892bd9ca8ea08728ee0784e6597
parent 152d7bd80dca5ce77ec2d7313149a2ab990e808e
author Linus Torvalds <torvalds@linux-foundation.org> 1447464948 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1447464948 -0800

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fixes from Dan Williams:

 - three fixes tagged for -stable including a crash fix, simple
   performance tweak, and an invalid i/o error.

 - build regression fix for the nvdimm unit tests

 - nvdimm documentation update

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: fix __dax_pmd_fault crash
  libnvdimm: documentation clarifications
  libnvdimm, pmem: fix size trim in pmem_direct_access()
  libnvdimm, e820: fix numa node for e820-type-12 pmem ranges
  tools/testing/nvdimm, acpica: fix flag rename build breakage