From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 17:01:50 +0000 (-0700)
Subject: Merge tag 'localmodconfig-v3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.7-rc1~201
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69e9576bf283b0ee3423642d7e7dbe4b3a16e455;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'localmodconfig-v3.7-2' of git://git./linux/kernel/git/rostedt/linux-kconfig

Pull localmodconfig fixes from Steven Rostedt:
 "Bill Pemberton added some changes to make streamline-config.pl work
  again as a stand-alone tool (outside of make localmodconfig).

  Also, he added a couple of updates to make the code be more "Perl
  proper".

  Added last minute fix to localyesconfig, that was the same as
  localmodconfig since v3.2, due to a change in the makefiles."

* tag 'localmodconfig-v3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
  localmodconfig: Fix localyesconfig to set to 'y' not 'm'
  localmodconfig: Use my variable for loop in streamline_config.pl
  localmodconfig: Use 3 parameter open in streamline_config.pl
  localmodconfig: Rework find_config in streamline_config.pl
  localmodconfig: Set default value for ksource in streamline_config.pl
---

69e9576bf283b0ee3423642d7e7dbe4b3a16e455