diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
commit | c44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch) | |
tree | c97d8cab54f9d62faa5a5713298418ab93a452e0 /Documentation/input/gamepad.txt | |
parent | 325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c (diff) | |
parent | d7fe1a67f658b50ec98ee1afb86df7b35c2b2593 (diff) |
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'Documentation/input/gamepad.txt')