summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 14:08:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 14:08:15 -0800
commitd72681d7c61f32a89147b8867cfb80e4ea119972 (patch)
tree2a83f714290065a9696d59f9f286887f134cfbe7 /MAINTAINERS
parent762fb1ddd561aac5b14afac19287672b99242811 (diff)
parente125096e733e966e055ee6033169f68233f9bf9c (diff)
downloadlinux-stable-d72681d7c61f32a89147b8867cfb80e4ea119972.tar.gz
linux-stable-d72681d7c61f32a89147b8867cfb80e4ea119972.tar.bz2
linux-stable-d72681d7c61f32a89147b8867cfb80e4ea119972.zip
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig changes from Michal Marek: - xconfig stores its setting in a meaningful path (~/.config/kernel.org/qconf.conf) - kconfig symbol search fix - documentation fixes - cleanup & comment update - fix warning when a kconfig symbol is defined with two different types - Yann is now officially listed as maintainer of kconfig, but he prefers me to send pull requests for now * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: MAINTAINERS: New kconfig maintainer xconfig: Fix the filename for GUI settings kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len kconfig: remove unused definition from scanner kconfig: adjust warning message for conflicting types kconfig: fix trivial typos and update mconf documentation kconfig: add short explanation to SYMBOL_WRITE Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d2270c070c0f..affd429843e4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4808,9 +4808,10 @@ S: Maintained
F: drivers/staging/ktap/
KCONFIG
-M: Michal Marek <mmarek@suse.cz>
+M: "Yann E. MORIN" <yann.morin.1998@free.fr>
L: linux-kbuild@vger.kernel.org
-S: Odd Fixes
+T: git://gitorious.org/linux-kconfig/linux-kconfig
+S: Maintained
F: Documentation/kbuild/kconfig-language.txt
F: scripts/kconfig/