From: Olof Johansson <olof@lixom.net>
Date: Sun, 18 Dec 2011 04:32:23 +0000 (-0800)
Subject: Merge branch 'for-3.3/dt' into for-next
X-Git-Tag: next-20111219~99^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ded926403a18e30288150dc6d784c829c315b8c9;p=karo-tx-linux.git

Merge branch 'for-3.3/dt' into for-next

Conflicts:
	arch/arm/mach-tegra/Makefile
---

ded926403a18e30288150dc6d784c829c315b8c9