diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 19:07:19 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 19:07:19 +0200 |
commit | 1b982baf75e7d9585967fcfccd05b77bf9054010 (patch) | |
tree | d997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /block/badblocks.c | |
parent | Merge branch 'for-4.7/dsm' into libnvdimm-for-next (diff) | |
parent | nfit: export subsystem ids as attributes (diff) | |
download | linux-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.xz linux-1b982baf75e7d9585967fcfccd05b77bf9054010.zip |
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'block/badblocks.c')
0 files changed, 0 insertions, 0 deletions