From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Aug 2010 01:28:24 +0000 (-0700)
Subject: Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil... 
X-Git-Tag: firefly_0821_release~9833^2~672
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c70662ec47191eb235bb1d0a1466b923b7a08a94;p=firefly-linux-kernel-4.4.55.git

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

c70662ec47191eb235bb1d0a1466b923b7a08a94