diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 16:54:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 16:54:01 -0700 |
| commit | f3ae1c75203535f65448517e46c8dd70a56b6c71 (patch) | |
| tree | 58f719cb97666dcfb3392c6c0547d6cbce2e68c8 /MAINTAINERS | |
| parent | 9720d75399fd2655a6b6fb06abcf548150f22362 (diff) | |
| parent | d49e46875c11a09e80e76c66db90710369b8fe12 (diff) | |
| download | linux-f3ae1c75203535f65448517e46c8dd70a56b6c71.tar.gz linux-f3ae1c75203535f65448517e46c8dd70a56b6c71.tar.bz2 linux-f3ae1c75203535f65448517e46c8dd70a56b6c71.zip | |
Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
xconfig: merge code path to conf_write()
kconfig: do not record timestamp in .config
gconfig: Hide unused left treeview when start up the interface
gconfig: enable rules hint for main treeviews
MAINTAINERS: Update KCONFIG entry
kconfig-language: add to hints
kconfig: Document the new "visible if" syntax
kconfig: quiet commands when V=0
kconfig: change update-po-config to reflect new layout of arch/um
kconfig: make update-po-config work in KBUILD_OUTPUT
kconfig: rearrange clean-files
kconfig: change gconf to modify hostprogs-y like nconf and mconf
kconfig: change qconf to modify hostprogs-y like nconf and mconf
kconfig: only build kxgettext when needed
nconfig: Silence unused return values from wattrset
kconfig: Do not record timestamp in auto.conf and autoconf.h
kconfig: get rid of unused flags
kconfig: allow multiple inclusion of the same file
kconfig: Avoid buffer underrun in choice input
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a26c9ee7703d..43494463b57d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3597,10 +3597,9 @@ F: Documentation/hwmon/k8temp F: drivers/hwmon/k8temp.c KCONFIG -M: Roman Zippel <zippel@linux-m68k.org> +M: Michal Marek <mmarek@suse.cz> L: linux-kbuild@vger.kernel.org -Q: http://patchwork.kernel.org/project/linux-kbuild/list/ -S: Maintained +S: Odd Fixes F: Documentation/kbuild/kconfig-language.txt F: scripts/kconfig/ |