Merge commit 'v2.6.37-rc8' into x86/apic

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 1 deletions

diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index fc3b18d844af..98dec87974d0 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -333,7 +333,10 @@ static void docsect(char *filename, char *line)
                 if (*s == '\n')
                         *s = '\0';
 
-        asprintf(&s, "DOC: %s", line);
+        if (asprintf(&s, "DOC: %s", line) < 0) {
+                perror("asprintf");
+                exit(1);
+        }
         consume_symbol(s);
         free(s);