Skip to content
Commit 95d465fd authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Manual merge with Linus. 

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c
parents 642fde17 683aa401
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