diff --git a/[refs] b/[refs] index 264ab37d5792..c6d11064611f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43b0f91d42a4dd602a72aa7a6508f484773f0922 +refs/heads/master: 83823b721cd9abcab11e814d4f60456902a2dc66 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3594a73974b1..0bdea728464e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5398,7 +5398,8 @@ S: Maintained F: arch/arm/mach-spear*/clock.c F: arch/arm/mach-spear*/include/mach/clkdev.h F: arch/arm/plat-spear/clock.c -F: arch/arm/plat-spear/include/plat/clock.h and clkdev.h +F: arch/arm/plat-spear/include/plat/clkdev.h +F: arch/arm/plat-spear/include/plat/clock.h SPEAR PAD MULTIPLEXING SUPPORT M: Viresh Kumar