Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ff105830de63898f92c138f5c96445a5c4263ff5..60c68fbee64a31fb583524fa034eade5c8f4418c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2131,9 +2131,10 @@ M:       Mike Turquette <[email protected]>
 L:     [email protected] (same as CLK API & CLKDEV)
 T:     git git://git.linaro.org/people/mturquette/linux.git
 S:     Maintained
-F:     drivers/clk/clk.c
-F:     drivers/clk/clk-*
+F:     drivers/clk/
+X:     drivers/clk/clkdev.c
 F:     include/linux/clk-pr*
+F:     include/linux/clk/
 
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:     Steve French <[email protected]>
@@ -4732,10 +4733,10 @@ F:      arch/s390/kvm/
 F:     drivers/s390/kvm/
 
 KERNEL VIRTUAL MACHINE (KVM) FOR ARM
-M:     Christoffer Dall <c[email protected]>
+M:     Christoffer Dall <c[email protected]>
 L:     [email protected]
 W:     http://systems.cs.columbia.edu/projects/kvm-arm
-S:     Maintained
+S:     Supported
 F:     arch/arm/include/uapi/asm/kvm*
 F:     arch/arm/include/asm/kvm*
 F:     arch/arm/kvm/