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

	$< -s $(Kconfig)

localmodconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)perl $< $(Kconfig) > .tmp.config

	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config

	$(Q)if [ -f .config ]; then 				\

			cmp -s .tmp.config .config ||		\

			(mv -f .config .config.old.1;		\

	$(Q)rm -f .tmp.config

localyesconfig: $(obj)/streamline_config.pl $(obj)/conf

	$(Q)perl $< $(Kconfig) > .tmp.config

	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config

	$(Q)sed -i s/=m/=y/ .tmp.config

	$(Q)if [ -f .config ]; then 				\

			cmp -s .tmp.config .config ||		\

#    make oldconfig

#

my $config = ".config";

my $linuxpath = ".";

my $uname = `uname -r`;

chomp $uname;

find_config;

my @makefiles = `find $linuxpath -name Makefile`;

# Get the build source and top level Kconfig file (passed in)

my $ksource = $ARGV[0];

my $kconfig = $ARGV[1];

my @makefiles = `find $ksource -name Makefile`;

my %depends;

my %selects;

my %prompts;

my $var;

my $cont = 0;

# Get the top level Kconfig file (passed in)

my $kconfig = $ARGV[0];

# prevent recursion

my %read_kconfigs;

    my $config;

    my @kconfigs;

    open(KIN, $kconfig) || die "Can't open $kconfig";

    open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig";

    while (<KIN>) {

	chomp;