From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 May 2015 16:28:04 +0000 (+0200)
Subject: Merge tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.1~159^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd1a6e7b47246dd91c02d46f9a373822a1d972cc;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'stericsson-fixes-v4.1' of git://git./linux/kernel/git/linusw/linux-stericsson into fixes

Merge "Ux500 fixes" from Linus Walleij:

This fixes an MMC/SD configuration issue present for some time
in the Ux500 DT but triggered by proper error handling in v4.1-rc1.

* tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Enable GPIO regulator for SD-card for snowball
  ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
  ARM: ux500: Move GPIO regulator for SD-card into board DTSs
---

bd1a6e7b47246dd91c02d46f9a373822a1d972cc