From: Linus Walleij <linus.walleij@linaro.org>
Date: Sun, 28 Oct 2012 20:24:19 +0000 (+0100)
Subject: Merge branch 'nomadik' into for-next
X-Git-Tag: next-20121029~19^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0ad7e7b772ac98bc911af3ff16dd1851ad0e162;p=karo-tx-linux.git

Merge branch 'nomadik' into for-next
---

a0ad7e7b772ac98bc911af3ff16dd1851ad0e162