Skip to content
Snippets Groups Projects
Commit 61e0e79e authored by David Vrabel's avatar David Vrabel
Browse files

Merge branch 'master' into for-upstream 

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile
parents c15895ef 0cfd8103
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 238 additions and 1738 deletions
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