Merge remote-tracking branch 'kbuild/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc include/linux/compiler-gcc4.h
Simple merge

diff --cc scripts/kernel-doc
index 01e8a8e2260283d4551432406cb91d9b6e8e97cf,97e037aa97a7a3d1f41c1a9645982b8c82023b8a..46e7aff80d1a8d1b2ea054d1febc0e8ce0404c35
--- 1/scripts/kernel-doc
--- 2/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@@ -460,14 -479,14 +481,19 @@@ sub output_highlight 
      die $@ if $@;
  #   print STDERR "contents af:$contents\n";
  
+ #   strip whitespaces when generating html5
+     if ($output_mode eq "html5") {
+       $contents =~ s/^\s+//;
+       $contents =~ s/\s+$//;
+     }
      foreach $line (split "\n", $contents) {
 +      if (! $output_preformatted) {
 +          $line =~ s/^\s*//;
 +      }
        if ($line eq ""){
 -          print $lineprefix, local_unescape($blankline);
 +          if (! $output_preformatted) {
 +              print $lineprefix, local_unescape($blankline);
 +          }
        } else {
            $line =~ s/\\\\\\/\&/g;
            if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {

diff --cc scripts/mod/modpost.c
Simple merge

diff --cc tools/testing/ktest/ktest.pl
Simple merge