Merge 3.19-rc5 into staging-next

We want the staging fixes in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/vt6655/baseband.c
Simple merge

diff --cc drivers/staging/vt6655/channel.c
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

diff --cc drivers/staging/vt6655/rxtx.c
Simple merge