Skip to content
Commit d2102677 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.4-rc5 into staging-next 



This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 69964ea4 5bb196ad
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