From: Linus Walleij <linus.walleij@linaro.org>
Date: Sun, 11 Nov 2012 18:12:46 +0000 (+0100)
Subject: Merge branch 'nomadik' into devel
X-Git-Tag: v3.8-rc1~188^2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae1cde8c50d0c6afa073eba03b802bbeee861cf9;p=users%2Fwilly%2Flinux.git

Merge branch 'nomadik' into devel
---

ae1cde8c50d0c6afa073eba03b802bbeee861cf9