diff options
author | Olof Johansson <olof@lixom.net> | 2015-03-29 14:00:53 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-03-29 14:01:02 -0700 |
commit | 4550bdb0bd8fd603412eab53bd331be5ef8e47a0 (patch) | |
tree | ea03d1d89a0dce8a487b5e13b17890dae845db6a /fs/ocfs2/dlm | |
parent | b1dae3d8b0563f49d2eeddb8403b6e0b2fc93a80 (diff) | |
parent | 370a9b5fb04a0d5cc7b7699c788616d6976f4476 (diff) |
Merge tag 'sunxi-fixes-for-4.0' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Allwinner fixes for 4.0
There's a few fixes to merge for 4.0, one to add a select in the machine
Kconfig option to fix a potential build failure, and two fixing cpufreq related
issues.
* tag 'sunxi-fixes-for-4.0' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/ocfs2/dlm')
0 files changed, 0 insertions, 0 deletions