Merge 3.9-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2013 18:46:45 +0000 (11:46 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2013 18:46:45 +0000 (11:46 -0700)
commitb43f9b59e65e1d4ff06474885b44515817868fdd
tree0de0ca983a6624b0582034154da4d17a170caf1e
parentc37b95eeefee32a765a9bbbfeaece48a361b2d23
parent07961ac7c0ee8b546658717034fe692fd12eefa9
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>
MAINTAINERS
drivers/staging/comedi/drivers/s626.c
drivers/staging/zcache/Kconfig