From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 7 Jan 2012 11:51:28 +0000 (+0000)
Subject: Merge branch 'depends/rmk/restart' into next/cleanup
X-Git-Tag: v3.3-rc1~144^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40ba95fdf158713377d47736b1b3a9d75f4f2515;p=pandora-kernel.git

Merge branch 'depends/rmk/restart' into next/cleanup

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

40ba95fdf158713377d47736b1b3a9d75f4f2515
Reading git-diff-tree failed