summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-09-05 12:13:17 +0300
committerJiri Kosina <jkosina@suse.cz>2017-09-05 12:13:17 +0300
commit5c891d5e094c15bd7791dc84749b5239257f5f2d (patch)
treebcfc6ca02f988aef9860de3a4fe52589151f8db3 /net
parent38e50c9ba84ad755247220ce6a881fbdb44aaeec (diff)
parent0acb310c3273d55ad19c9a5f48b73224ce6e2dc0 (diff)
downloadlinux-5c891d5e094c15bd7791dc84749b5239257f5f2d.tar.xz
Merge branch 'for-4.14/upstream' into for-linus
- usb_device_id and snd_rawmidi_ops constifications from Julia Lawall and Arvind Yadav
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions