summary refs log tree commit diff
path: root/include/dt-bindings
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-12-22 13:10:00 -0800
committerOlof Johansson <olof@lixom.net>2015-12-22 13:10:00 -0800
commit8907dbaa363de87e5c6f48070e3d8b639477d5ba (patch)
tree8c3e0245a7bd10535e5fab6d2da99de6824f5851 /include/dt-bindings
parent9cdac4a20a963d946f3ce13e6dd4943a780f5b54 (diff)
parente324654294907a420ab3773efe8849a935f37bf0 (diff)
downloadlinux-8907dbaa363de87e5c6f48070e3d8b639477d5ba.tar.gz
Merge branch 'treewide/cleanup' into next/soc
Merge in cleanup to avoid internal conflicts with newly added code.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings')
0 files changed, 0 insertions, 0 deletions