Merge 3.9-rc3 into staging-next

This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/comedi/drivers/usbdux.c
Simple merge

diff --cc drivers/staging/comedi/drivers/usbduxsigma.c
Simple merge

diff --cc drivers/staging/vt6656/card.c
Simple merge

diff --cc drivers/staging/vt6656/main_usb.c
Simple merge