diff options
author | Dan Williams <dan.j.williams@intel.com> | 2020-12-24 10:14:04 -0800 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2020-12-24 10:14:04 -0800 |
commit | 127c3d2e7e8a79628160e56e54d2be099bdd47c6 (patch) | |
tree | aa72591b75209d06ca673f2f57559ad8b5e2b4f7 /drivers/input/misc/drv260x.c | |
parent | libnvdimm/label: Return -ENXIO for no slot in __blk_label_update (diff) | |
parent | device-dax: Avoid an unnecessary check in alloc_dev_dax_range() (diff) | |
download | linux-dev-127c3d2e7e8a79628160e56e54d2be099bdd47c6.tar.xz linux-dev-127c3d2e7e8a79628160e56e54d2be099bdd47c6.zip |
Merge branch 'for-5.11/dax' into for-5.11/libnvdimm
Pull in miscellaneous device-dax fixups and cleanups for v5.11.
Diffstat (limited to 'drivers/input/misc/drv260x.c')
0 files changed, 0 insertions, 0 deletions