tree dc5e251ff0eac8ae2f022858c0d7526299235f1d
parent 2f98735c9c24ea1f0d40a364d4e63611b689b795
parent 8891fec65ac5b5a74b50c705e31b66c92c3eddeb
author Linus Torvalds <torvalds@linux-foundation.org> 1202140577 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1202140577 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  scsi: fix dependency bug in aic7 Makefile
  kbuild: add svn revision information to setlocalversion
  kbuild: do not warn about __*init/__*exit symbols being exported
  Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
  Add HAVE_KPROBES
  Add HAVE_OPROFILE
  Create arch/Kconfig
  Fix ARM to play nicely with generic Instrumentation menu
  kconfig: ignore select of unknown symbol
  kconfig: mark config as changed when loading an alternate config
  kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
  Remove __INIT_REFOK and __INITDATA_REFOK
  kbuild: print only total number of section mismatces found