From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Sep 2012 09:53:35 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20120917~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=55a9b48dfaffbd38ecf949ed93b59a38362e3da7;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'

Conflicts:
	arch/arm/mach-tegra/devices.c
---

55a9b48dfaffbd38ecf949ed93b59a38362e3da7