From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 7 Jan 2012 12:44:37 +0000 (+0000)
Subject: Merge branch 'samsung/dt' into next/dt
X-Git-Tag: v3.3-rc1~143^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b001befe58691ef3627458cd814e8cee7f845c5f;p=pandora-kernel.git

Merge branch 'samsung/dt' into next/dt

* samsung/dt: (3 commit)
  Merge branch 'depends/rmk/for-linus' into samsung/dt
  Merge branch 'depends/rmk/restart' into next/cleanup
  Merge branch 'next/cleanup' into samsung/dt

Conflicts:
	arch/arm/mach-tegra/board-dt.c
	arch/arm/mach-tegra/include/mach/entry-macro.S

The latest version of the samsung/dt branch resolves
all sorts of conflicts with the latest upstream, no functional
changes that are not already there.

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

b001befe58691ef3627458cd814e8cee7f845c5f
Reading git-diff-tree failed