Skip to content
Commit 14ef2b0c authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus 

Conflicts:
	drivers/hid/Kconfig
parents 57ab12e4 71b38bd4
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