Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Jun 2010 15:55:52 +0000 (08:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Jun 2010 15:55:52 +0000 (08:55 -0700)
commit1f73897861b8ef0be64ff4b801f8d6f830f683b5
treeb4bae8f12e1422113910d8cb00a19d010dc4a52f
parentb904d7131d116900524bd36ec170dcd97846bfd3
parent64ffc9ff424c65adcffe7d590018cc75e2d5d42a
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...
25 files changed:
.gitignore
MAINTAINERS
Makefile
arch/ia64/include/asm/percpu.h
arch/ia64/kernel/ivt.S
arch/parisc/include/asm/system.h
arch/powerpc/include/asm/cache.h
arch/s390/kernel/swsusp_asm64.S
arch/sh/include/asm/cache.h
arch/sparc/include/asm/cache.h
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/vmlinux.lds.S
include/asm-generic/percpu.h
include/asm-generic/vmlinux.lds.h
include/linux/init_task.h
include/linux/percpu-defs.h
include/linux/spinlock.h
init/Kconfig
kernel/module.c
scripts/Makefile.lib
scripts/gen_initramfs_list.sh
scripts/kconfig/Makefile
scripts/kconfig/util.c
scripts/markup_oops.pl
scripts/package/mkspec