git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Olof Johansson <olof@lixom.net>
	Tue, 22 Dec 2015 21:10:00 +0000 (13:10 -0800)
committer	Olof Johansson <olof@lixom.net>
	Tue, 22 Dec 2015 21:10:00 +0000 (13:10 -0800)
commit	8907dbaa363de87e5c6f48070e3d8b639477d5ba
tree	8c3e0245a7bd10535e5fab6d2da99de6824f5851	tree
parent	9cdac4a20a963d946f3ce13e6dd4943a780f5b54	commit \| diff
parent	e324654294907a420ab3773efe8849a935f37bf0	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/arm/mach-bcm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-bcm/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/Kconfig	diff1 \|	diff2 \|	blob \| history