diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 01:54:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 01:54:01 +0200 |
commit | f3ae1c75203535f65448517e46c8dd70a56b6c71 (patch) | |
tree | 58f719cb97666dcfb3392c6c0547d6cbce2e68c8 /drivers/net/ksz884x.c | |
parent | Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/ol... (diff) | |
parent | xconfig: merge code path to conf_write() (diff) | |
download | linux-f3ae1c75203535f65448517e46c8dd70a56b6c71.tar.xz 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 'drivers/net/ksz884x.c')
0 files changed, 0 insertions, 0 deletions