Merge 3.9-rc3 into staging-next
Greg Kroah-Hartman [Mon, 18 Mar 2013 16:34:14 +0000 (09:34 -0700)]
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>

1  2 
MAINTAINERS
drivers/staging/comedi/drivers/usbdux.c
drivers/staging/comedi/drivers/usbduxsigma.c
drivers/staging/vt6656/card.c
drivers/staging/vt6656/main_usb.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge