tree b15efa1a4410fc783f0df5c90b0c33104eea37ae
parent ee005577aa3b89f5291fe73be2054d375d23f5eb
parent 8558f59edf935cf5ee5ffc29a9e9458fd9a71be1
author Linus Torvalds <torvalds@linux-foundation.org> 1282613304 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282613304 -0700

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  setlocalversion: Ignote SCMs above the linux source tree
  makefile: not need to regenerate kernel.release file when make kernelrelease
  fixes for using make 3.82
  kconfig: fix segfault when detecting recursive dependency
  kconfig: fix savedefconfig with choice marked optional