Skip to content
Commit 621de593 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'autosuspend' into for-next 

Conflicts:

	drivers/hid/hid-core.c
parents afa5eb7c 6d779768
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment