diff options
author | 2013-11-26 12:41:13 -0800 | |
---|---|---|
committer | 2013-11-26 12:41:13 -0800 | |
commit | 75cc4d470cec5f46888a6dbeddf243502c06810d (patch) | |
tree | ab7654ddcc3f3b5763c68112c69a3bbe27dd064a /tools/perf/scripts/python/export-to-postgresql.py | |
parent | ARM: bcm2835: add missing #xxx-cells to I2C nodes (diff) | |
parent | Revert "ARM: ux500: Stop passing MMC's platform data for Device Tree boots" (diff) | |
download | linux-dev-75cc4d470cec5f46888a6dbeddf243502c06810d.tar.xz linux-dev-75cc4d470cec5f46888a6dbeddf243502c06810d.zip |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions