diff options
| author | Ingo Molnar | 2016-03-04 12:12:08 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2016-03-04 12:12:08 +0100 |
| commit | bc94b99636dc7bcccce439a9fb9c00065e2e2627 (patch) | |
| tree | bddbd29a5fd7b2d270d039efc1d6858791a2c98f /drivers/nvdimm/pfn.h | |
| parent | ACPI/EINJ: Allow memory error injection to NVDIMM (diff) | |
| parent | Linux 4.5-rc6 (diff) | |
| download | kernel-qcow2-linux-bc94b99636dc7bcccce439a9fb9c00065e2e2627.tar.gz kernel-qcow2-linux-bc94b99636dc7bcccce439a9fb9c00065e2e2627.tar.xz kernel-qcow2-linux-bc94b99636dc7bcccce439a9fb9c00065e2e2627.zip | |
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvdimm/pfn.h')
0 files changed, 0 insertions, 0 deletions