From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Feb 2008 15:56:17 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
X-Git-Tag: v2.6.25-rc1~1062
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=519cb688072008363e091be3f291c1b5779e2ba8;p=linux-2.6

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
---

519cb688072008363e091be3f291c1b5779e2ba8