From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Feb 2010 22:44:33 +0000 (-0800)
Subject: Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v2.6.34-rc1~291
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=b6d97026561a6ed6eed58428633a6bb4e1b78c57

Merge branch 'for-linus-2' of git://git./linux/kernel/git/rostedt/linux-2.6-kconfig

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
  kconfig: Simplify LSMOD= handling
  kconfig: Add LSMOD=file to override the lsmod for localmodconfig
  kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl
  kconfig: Check for if conditions in Kconfig for localmodconfig
  kconfig: Create include/generated for localmodconfig
---

b6d97026561a6ed6eed58428633a6bb4e1b78c57