diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 10:41:22 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 10:41:22 (GMT) |
| commit | 3390e579b3dac71e630ed879a73c5ac3b4447045 (patch) | |
| tree | fcd7f4118654286c1e634c87e4ad3efcea3c637d /drivers/acpi/nfit.c | |
| parent | 27fd38c5226ed0f1712d071880fa8e739eb78650 (diff) | |
| parent | 282bf1fe6dca4b768d6bedc14aea1b82c36241c1 (diff) | |
| download | linux-3390e579b3dac71e630ed879a73c5ac3b4447045.tar.xz | |
Merge branch 'for-4.7/upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/acpi/nfit.c')
0 files changed, 0 insertions, 0 deletions