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

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

Conflicts:

	drivers/usb/input/hid.h
parents 4bdbd280 c9976797
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 294 additions and 173 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