From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Dec 2011 22:51:00 +0000 (+0000)
Subject: Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
X-Git-Tag: v3.3-rc1~141^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0782e5bb57e16428de32f0f933c77324b186193f;p=pandora-kernel.git

Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc

Dependencies for tegra/soc branch

Conflicts:
  arch/arm/mach-tegra/board-dt.c

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

0782e5bb57e16428de32f0f933c77324b186193f
Reading git-diff-tree failed