From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 7 Jan 2012 20:53:13 +0000 (+0000)
Subject: Merge branch 'depends/rmk/for-linus' into next/soc
X-Git-Tag: v3.3-rc1~141^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8;p=pandora-kernel.git

Merge branch 'depends/rmk/for-linus' into next/soc

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

23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8
Reading git-diff-tree failed