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/powerpc/platforms/powernv/opal-flash.c
index 4aeae4f36e1d718f865a0722194fc7991acec778,d8773079ce195afd380a6fa97c5fc5809a976a78..d8f67badd1cfc11adcb9f5667601186159c1cf1f
--- 1/arch/powerpc/platforms/powernv/opal-flash.c
--- 2/arch/powerpc/platforms/powernv/opal-flash.c
+++ b/arch/powerpc/platforms/powernv/opal-flash.c
@@@ -103,9 -103,30 +103,9 @@@ struct image_header_t 
        uint32_t        size;
  };
  
 -/* Scatter/gather entry */
 -struct opal_sg_entry {
 -      void    *data;
 -      long    length;
 -};
 -
 -/* We calculate number of entries based on PAGE_SIZE */
 -#define SG_ENTRIES_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct opal_sg_entry))
 -
 -/*
 - * This struct is very similar but not identical to that
 - * needed by the opal flash update. All we need to do for
 - * opal is rewrite num_entries into a version/length and
 - * translate the pointers to absolute.
 - */
 -struct opal_sg_list {
 -      unsigned long num_entries;
 -      struct opal_sg_list *next;
 -      struct opal_sg_entry entry[SG_ENTRIES_PER_NODE];
 -};
 -
  struct validate_flash_t {
        int             status;         /* Return status */
-       void            *buf;           /* Candiate image buffer */
+       void            *buf;           /* Candidate image buffer */
        uint32_t        buf_size;       /* Image size */
        uint32_t        result;         /* Update results token */
  };

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 drivers/net/wan/lmc/lmc_main.c
Simple merge

diff --cc init/Kconfig
Simple merge

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

diff --cc net/nfc/hci/llc_shdlc.c
Simple merge