' into libnvdimm-for-next - net-next.git - net-next plumbings
summaryrefslogtreecommitdiff
path: root/Documentation/input/gamepad.txt
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-12-17 15:08:10 -0800
committerDan Williams <dan.j.williams@intel.com>2016-12-17 15:08:10 -0800
commitc44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch)
treec97d8cab54f9d62faa5a5713298418ab93a452e0 /Documentation/input/gamepad.txt
parent325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c (diff)
parentd7fe1a67f658b50ec98ee1afb86df7b35c2b2593 (diff)
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'Documentation/input/gamepad.txt')