summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-05-18 20:07:19 +0300
committerDan Williams <dan.j.williams@intel.com>2016-05-18 20:07:19 +0300
commit1b982baf75e7d9585967fcfccd05b77bf9054010 (patch)
treed997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /drivers/input
parent1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc (diff)
parent6ca7208569550de43d64db6cf873706c371284a5 (diff)
downloadlinux-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.xz
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions