From d30547e828bcacf909628c9e0a43edb658c65ccc Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 26 Oct 2010 14:22:59 -0700 Subject: [PATCH] --- yaml --- r: 217562 b: refs/heads/master c: ec15408206e6b87a11dc1560b2bd758d2ad7ccb1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3c09acabf354..50e0ae430901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fae99206769b6bbf8a20ab883726b164945771d7 +refs/heads/master: ec15408206e6b87a11dc1560b2bd758d2ad7ccb1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 146b8a068a4e..a8d1f5686cee 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -710,8 +710,7 @@ ARM/INCOME PXA270 SUPPORT M: Marek Vasut L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: arch/arm/mach-pxa/income.c -F: arch/arm/mach-pxa/include/mach-pxa/income.h +F: arch/arm/mach-pxa/colibri-pxa270-income.c ARM/INTEL IOP32X ARM ARCHITECTURE M: Lennert Buytenhek