Merge branch 'linus' into core/iommu

Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
              to resync with the latest upstream fixes and make sure
              the combination works fine.

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

1 files changed, 24 insertions, 0 deletions

diff --git a/arch/cris/boot/rescue/testrescue.S b/arch/cris/boot/rescue/testrescue.S
new file mode 100644
index 00000000000..fc7ec674eca
--- /dev/null
+++ b/arch/cris/boot/rescue/testrescue.S
@@ -0,0 +1,24 @@
+/*
+ * Simple testcode to download by the rescue block.
+ * Just lights some LEDs to show it was downloaded correctly.
+ *
+ * Copyright (C) 1999 Axis Communications AB
+ */
+
+#define ASSEMBLER_MACROS_ONLY
+#include <arch/sv_addr_ag.h>
+
+        .text
+
+        nop
+        nop
+        moveq   -1, $r2
+        move.b  $r2, [R_PORT_PA_DIR]
+        moveq   0, $r2
+        move.b  $r2, [R_PORT_PA_DATA]
+
+endless:
+        nop
+        ba      endless
+        nop
+