diff options
| author | Olof Johansson <olof@lixom.net> | 2013-11-26 15:41:13 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-11-26 15:41:13 -0500 |
| commit | 75cc4d470cec5f46888a6dbeddf243502c06810d (patch) | |
| tree | ab7654ddcc3f3b5763c68112c69a3bbe27dd064a /samples | |
| parent | a31ab44ef5d07c6707df4a9ad2c8affd2d62ff4b (diff) | |
| parent | 5281973012bdcfd93a8f6e0f5b4e04af0038ea99 (diff) | |
Merge tag 'ux500-fixes-v3.13-1' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions