From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 13:02:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20131024~17
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=62f5694343e6f6389d37e410178936186346ebbd

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

Conflicts:
	MAINTAINERS
---

62f5694343e6f6389d37e410178936186346ebbd