From d2a6ad0a169e6070f5f183482782b1e2ebabb2fe Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Thu, 31 Jan 2013 13:38:48 +0000
Subject: [PATCH] --- yaml --- r: 360670 b: refs/heads/master c:
 82f0167aa4c4bbc06b5a2e1e83d252792f7c5754 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/metag/kernel/setup.c | 46 ++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index f07c0bd54ceb..693ff47b16fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bea5b8188e98611e4d6961647809f87b023e14c
+refs/heads/master: 82f0167aa4c4bbc06b5a2e1e83d252792f7c5754
diff --git a/trunk/arch/metag/kernel/setup.c b/trunk/arch/metag/kernel/setup.c
index 89f9cdc389e8..aaebc56270ec 100644
--- a/trunk/arch/metag/kernel/setup.c
+++ b/trunk/arch/metag/kernel/setup.c
@@ -5,43 +5,43 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
+#include <linux/bootmem.h>
+#include <linux/console.h>
+#include <linux/cpu.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
+#include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/console.h>
 #include <linux/genhd.h>
-#include <linux/errno.h>
-#include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
-#include <linux/root_dev.h>
 #include <linux/initrd.h>
-#include <linux/seq_file.h>
-#include <linux/pfn.h>
-#include <linux/start_kernel.h>
-#include <linux/cpu.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
 #include <linux/memblock.h>
+#include <linux/mm.h>
 #include <linux/of_fdt.h>
+#include <linux/pfn.h>
+#include <linux/root_dev.h>
+#include <linux/sched.h>
+#include <linux/seq_file.h>
+#include <linux/start_kernel.h>
+#include <linux/string.h>
 
 #include <asm/cachepart.h>
 #include <asm/clock.h>
-#include <asm/sections.h>
-#include <asm/setup.h>
-#include <asm/processor.h>
-#include <asm/traps.h>
-#include <asm/mmu.h>
+#include <asm/core_reg.h>
 #include <asm/cpu.h>
+#include <asm/da.h>
+#include <asm/highmem.h>
 #include <asm/hwthread.h>
-#include <asm/mmzone.h>
 #include <asm/l2cache.h>
-#include <asm/da.h>
-#include <asm/prom.h>
 #include <asm/mach/arch.h>
-#include <asm/core_reg.h>
-#include <asm/highmem.h>
+#include <asm/mmu.h>
+#include <asm/mmzone.h>
+#include <asm/processor.h>
+#include <asm/prom.h>
+#include <asm/sections.h>
+#include <asm/setup.h>
+#include <asm/traps.h>
 
 /* PRIV protect as many registers as possible. */
 #define DEFAULT_PRIV	0xff0f7f00