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

Conflicts:
	drivers/gpu/drm/qxl/Kconfig

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

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

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/char/Makefile
Simple merge

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

diff --cc drivers/gpu/drm/qxl/Kconfig
index 66ac0ff95f5a30408bf722b43e49e76138e74546,b5be757062b28dfb4f79e86d4af65a395e0945f2..38c2bb72e4560f72aac8edf0095acf99b2b171b3
--- 1/drivers/gpu/drm/qxl/Kconfig
--- 2/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@@ -5,9 -5,10 +5,11 @@@ config DRM_QX
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_DEFERRED_IO
-         select DRM_KMS_HELPER
+       select DRM_KMS_HELPER
        select DRM_KMS_FB_HELPER
-         select DRM_TTM
+       select DRM_TTM
 +      select CRC32
        help
-               QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting.
+         QXL virtual GPU for Spice virtualization desktop integration.
+         Do not enable this driver unless your distro ships a corresponding
+         X.org QXL driver that can handle kernel modesetting.

diff --cc drivers/media/platform/ti-vpe/vpdma.c
Simple merge

diff --cc init/Kconfig
Simple merge

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