ARM: tegra: Sort includes alphabetically

If these aren't sorted alphabetically, then the logical choice is to
append new ones, however that creates a lot of potential for conflicts
because every change will then add new includes in the same location.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/mach-tegra/apbio.c b/arch/arm/mach-tegra/apbio.c
index bc47197..5f9647b 100644 (file)
--- a/arch/arm/mach-tegra/apbio.c
+++ b/arch/arm/mach-tegra/apbio.c
@@ -13,15 +13,15 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/of.h>
+#include <linux/completion.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
-#include <linux/spinlock.h>
-#include <linux/completion.h>
-#include <linux/sched.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
 
 #include "apbio.h"
 #include "iomap.h"

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/cpuidle-tegra114.c
Simple merge

diff --cc arch/arm/mach-tegra/cpuidle-tegra20.c
Simple merge

diff --cc arch/arm/mach-tegra/cpuidle-tegra30.c
Simple merge

diff --cc arch/arm/mach-tegra/flowctrl.c
Simple merge

diff --cc arch/arm/mach-tegra/fuse.c
Simple merge

diff --cc arch/arm/mach-tegra/hotplug.c
Simple merge

diff --cc arch/arm/mach-tegra/io.c
Simple merge

diff --cc arch/arm/mach-tegra/irq.c
Simple merge

diff --cc arch/arm/mach-tegra/platsmp.c
Simple merge

diff --cc arch/arm/mach-tegra/pm-tegra20.c
Simple merge

diff --cc arch/arm/mach-tegra/pm-tegra30.c
Simple merge

diff --cc arch/arm/mach-tegra/pm.c
Simple merge

diff --cc arch/arm/mach-tegra/pmc.c
Simple merge

diff --cc arch/arm/mach-tegra/powergate.c
Simple merge

diff --cc arch/arm/mach-tegra/reset-handler.S
Simple merge

diff --cc arch/arm/mach-tegra/reset.c
Simple merge

diff --cc arch/arm/mach-tegra/sleep-tegra30.S
Simple merge

diff --cc arch/arm/mach-tegra/tegra.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra114_speedo.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra20_speedo.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra30_speedo.c
Simple merge