From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 May 2016 18:36:26 +0000 (-0700)
Subject: Merge tag 'localmodconfig-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.7-rc1~120
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec67b14c1be4ebe4cf08f06746a8d0313ab85432;p=karo-tx-linux.git

Merge tag 'localmodconfig-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig

Pull localmodconfig updates from Steven Rostedt.
 "Benjamin Poirier added some minor fixes and clean ups to
  localmodconfig.

  One is a fix for making sure that module signing still works when
  coming from a different environment.  If original keys are not found
  it will warn and reset the keys to their default value"

* tag 'localmodconfig-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
  localmodconfig: Fix whitespace repeat count after "tristate"
  localmodconfig: Reset certificate paths
  localmodconfig: Add missing $ to reference a variable
  localmodconfig: Fix parsing of "help" text
  localmodconfig: Recognize more keywords that end a menu entry
  localmodconfig: Fix parsing of Kconfig "source" statements
---

ec67b14c1be4ebe4cf08f06746a8d0313ab85432