Skip to content
Snippets Groups Projects
Commit bc95f366 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c
parents 3d29cdff dc87c398
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 610 additions and 174 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