Merge branch 'for-4.14/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:13:17 +0000 (11:13 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:13:17 +0000 (11:13 +0200)
- usb_device_id and snd_rawmidi_ops constifications from Julia Lawall
  and Arvind Yadav


Trivial merge