aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 12:00:33 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 12:00:33 -0500
commit3d14b5beba35250c548d3851a2b84fce742d8311 (patch)
tree065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /MAINTAINERS
parent0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff)
parent1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff)
Merge branch 'sa1100' into devel
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 1 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ad59f178586f..75f771c8579f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3045,11 +3045,8 @@ S: Maintained
3045F: fs/autofs4/ 3045F: fs/autofs4/
3046 3046
3047KERNEL BUILD 3047KERNEL BUILD
3048M: Sam Ravnborg <sam@ravnborg.org>
3049T: git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git
3050T: git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
3051L: linux-kbuild@vger.kernel.org 3048L: linux-kbuild@vger.kernel.org
3052S: Maintained 3049S: Orphan
3053F: Documentation/kbuild/ 3050F: Documentation/kbuild/
3054F: Makefile 3051F: Makefile
3055F: scripts/Makefile.* 3052F: scripts/Makefile.*