From: Olof Johansson <olof@lixom.net>
Date: Tue, 26 Nov 2013 20:41:13 +0000 (-0800)
Subject: Merge tag 'ux500-fixes-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~4691^2~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=75cc4d470cec5f46888a6dbeddf243502c06810d;p=firefly-linux-kernel-4.4.55.git

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

From Linus Walleij, Ux500 fixes for the v3.13 series:

- Restore platform data for the (e)MMC/SD controllers, so they can
  pins and special flags properly like before.

* tag 'ux500-fixes-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  Revert "ARM: ux500: Stop passing MMC's platform data for Device Tree boots"
  Revert "ARM: ux500: Remove AUXDATA relating to SDI (MMC) clock-name bindings"
---

75cc4d470cec5f46888a6dbeddf243502c06810d