Merge commit 'v2.6.35-rc3' into perf/core

Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

42 files changed, 2824 insertions, 370 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 0b94d2fa3a88..e4deb73e9a84 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -82,7 +82,7 @@ ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
 lib-target := $(obj)/lib.a
 endif
 
-ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),)
+ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),)
 builtin-target := $(obj)/built-in.o
 endif
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cbcd654215e6..54fd1b700131 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -241,7 +241,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \
         lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
 
-quiet_cmd_lzo = LZO    $@
+quiet_cmd_lzo = LZO     $@
 cmd_lzo = (cat $(filter-out FORCE,$^) | \
         lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index 102a276f6eea..1adb974e6950 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -14,6 +14,11 @@ __modbuiltin:
 
 include scripts/Kbuild.include
 
+ifneq ($(KBUILD_SRC),)
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+endif
+
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 676ddc07d6fa..97b2c6143fe4 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -11,6 +11,8 @@
 # you do have real dups and do not have them under #ifdef's. You
 # could also just review the results.
 
+use strict;
+
 sub usage {
         print "Usage: checkincludes.pl [-r]\n";
         print "By default we just warn of duplicates\n";
@@ -35,23 +37,24 @@ if ($#ARGV >= 1) {
         }
 }
 
-foreach $file (@ARGV) {
-        open(FILE, $file) or die "Cannot open $file: $!.\n";
+foreach my $file (@ARGV) {
+        open(my $f, '<', $file)
+            or die "Cannot open $file: $!.\n";
 
         my %includedfiles = ();
         my @file_lines = ();
 
-        while (<FILE>) {
+        while (<$f>) {
                 if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
                         ++$includedfiles{$1};
                 }
                 push(@file_lines, $_);
         }
 
-        close(FILE);
+        close($f);
 
         if (!$remove) {
-                foreach $filename (keys %includedfiles) {
+                foreach my $filename (keys %includedfiles) {
                         if ($includedfiles{$filename} > 1) {
                                 print "$file: $filename is included more than once.\n";
                         }
@@ -59,27 +62,28 @@ foreach $file (@ARGV) {
                 next;
         }
 
-        open(FILE,">$file") || die("Cannot write to $file: $!");
+        open($f, '>', $file)
+            or die("Cannot write to $file: $!");
 
         my $dups = 0;
         foreach (@file_lines) {
                 if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
-                        foreach $filename (keys %includedfiles) {
+                        foreach my $filename (keys %includedfiles) {
                                 if ($1 eq $filename) {
                                         if ($includedfiles{$filename} > 1) {
                                                 $includedfiles{$filename}--;
                                                 $dups++;
                                         } else {
-                                                print FILE $_;
+                                                print {$f} $_;
                                         }
                                 }
                         }
                 } else {
-                        print FILE $_;
+                        print {$f} $_