Merge remote-tracking branch 'trivial/for-next'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/mach-at91/Kconfig.non_dt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/block/Makefile
Simple merge

diff --cc drivers/char/Makefile
Simple merge

diff --cc drivers/devfreq/exynos/exynos4_bus.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_g2d.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_gem.h
Simple merge

diff --cc drivers/xen/Kconfig
Simple merge

diff --cc include/linux/tracepoint.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/netfilter/ipset/Kconfig
Simple merge