Merge branch 'linus' into irq/numa

Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

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

1 files changed, 43 insertions, 0 deletions

diff --git a/arch/cris/boot/rescue/rescue_v32.lds b/arch/cris/boot/rescue/rescue_v32.lds
new file mode 100644
index 000000000000..8ac646bc1a2b
--- /dev/null
+++ b/arch/cris/boot/rescue/rescue_v32.lds
@@ -0,0 +1,43 @@
+/*#OUTPUT_FORMAT(elf32-us-cris) */
+OUTPUT_ARCH (crisv32)
+/* Now that NAND support has been stripped, this file could be simplified,
+ * but it doesn't do any harm on the other hand so why bother. */
+
+MEMORY
+        {
+        bootblk : ORIGIN = 0x38000000,
+                  LENGTH = 0x00004000
+        intmem  : ORIGIN = 0x38004000,
+                  LENGTH = 0x00005000
+        }
+
+SECTIONS
+{
+        .text :
+        {
+                _stext = . ;
+                *(.text)
+                *(.init.text)
+                *(.rodata)
+                *(.rodata.*)
+                _etext = . ;
+        } > bootblk
+        .data :
+        {
+                *(.data)
+                _edata = . ;
+        } > bootblk
+        .bss :
+        {
+                _bss = . ;
+                *(.bss)
+                _end = ALIGN( 0x10 ) ;
+        } > intmem
+
+        /* Get rid of stuff from EXPORT_SYMBOL(foo). */
+        /DISCARD/ :
+        {
+                *(__ksymtab_strings)
+                *(__ksymtab)
+        }
+}