Merge 3.9-rc5 into staging-next

This pulls in all of the good fixes we need here.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/staging/zcache/Kconfig
Simple merge