diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 17:13:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 17:13:26 +0200 |
commit | a787f40a9a29674d1b9146b7a35e491e7a571152 (patch) | |
tree | 2a2301cd90557ce8772a694ddff99397274897e1 /arch/alpha | |
parent | 2e4e5da55afaf9315f2398e85424fd3824459220 (diff) | |
parent | d8e1f5ed11a39a68da00f05000466c4f6db4456e (diff) | |
download | linux-a787f40a9a29674d1b9146b7a35e491e7a571152.tar.bz2 |
Merge tag 'omap-for-v4.3/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "Fixes for omap against v4.3-rc5" from Tony Lindgren:
- Regulator fix for beagle-x15 to fix HDMI without a SD card being
inserted
- GPMC fix for showing proper timings and to allow enabling debug
options that somehow was unselectable earlier
- Add minimal documentation for new MMC1 dependency on
REGULATOR_PBIAS as it may not be obvious for people with
targeted .config files
* tag 'omap-for-v4.3/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
Documentation: ARM: List new omap MMC requirements
memory: omap-gpmc: dump "before" state before first modification
memory: omap-gpmc: Fix unselectable debug option for GPMC
ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions