From: Olof Johansson Date: Wed, 24 Feb 2016 08:10:11 +0000 (-0800) Subject: Merge tag 'omap-for-v4.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: Ubuntu-5.2.0-15.16~9716^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9fa6c2b1aa7f6b05cd96a0d6bec499c9aef45479;p=mirror_ubuntu-eoan-kernel.git Merge tag 'omap-for-v4.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Two omap fixes for omaps against v4.5-rc5: - Yet another fix for n900 onenand to avoid corruption. This time to fix the issue of mounting onenand back and forth between the original maemo kernel and mainline Linux kernel. And it also seems there will be two more fixes coming via the MTD tree as issues were discovered also in the onenand driver during testing. - Revert tps65217 regulator clean up as it breaks MMC for am335x variants. The proper way to clean this up is just to rename the tps65217.dtsi file into tps65217-am335x.dtsi as a similar setup is used on many am335x boards. * tag 'omap-for-v4.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix onenand initialization to avoid filesystem corruption Revert "regulator: tps65217: remove tps65217.dtsi file" Signed-off-by: Olof Johansson --- 9fa6c2b1aa7f6b05cd96a0d6bec499c9aef45479