Merge 3.9-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Mar 2013 16:34:14 +0000 (09:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Mar 2013 16:34:14 +0000 (09:34 -0700)
commitc45bb8cb72136bf23d18926113bff04c8cc90813
treeae49a32f9c2536383c50d426c2eba1c7da1f22cf
parenta14592896023adcab12307774c89284ce0744ce2
parenta937536b868b8369b98967929045f1df54234323
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>
MAINTAINERS
drivers/staging/comedi/drivers/usbdux.c
drivers/staging/comedi/drivers/usbduxsigma.c
drivers/staging/vt6656/card.c
drivers/staging/vt6656/main_usb.c