Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 01:28:24 +0000 (18:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 01:28:24 +0000 (18:28 -0700)
commitc70662ec47191eb235bb1d0a1466b923b7a08a94
treeb15efa1a4410fc783f0df5c90b0c33104eea37ae
parentee005577aa3b89f5291fe73be2054d375d23f5eb
parent8558f59edf935cf5ee5ffc29a9e9458fd9a71be1
Merge branch 'rc-fixes' of git://git./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
Makefile