From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:31:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'mtd/master'
X-Git-Tag: next-20131025~62
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bfd6845393cd47fba6a5e9adef70ef468564debf;p=karo-tx-linux.git

Merge remote-tracking branch 'mtd/master'
---

bfd6845393cd47fba6a5e9adef70ef468564debf