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

Conflicts:
	Documentation/PCI/pci.txt
	arch/arm/mach-nuc93x/time.c
	drivers/ide/Kconfig
	drivers/net/Kconfig

diff --cc Documentation/kernel-parameters.txt
index e54ec2d14aac86a97eab554e61262ad91a9cc3ce,be9370c764c835f840e405038cfd87922b5bfc36..ea66883b9a0485624c3147c355e6ee4906692d24
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -725,13 -724,13 +725,13 @@@ bytes respectively. Such letter suffixe
  
        elevator=       [IOSCHED]
                        Format: {"cfq" | "deadline" | "noop"}
-                       See Documentation/block/as-iosched.txt and
+                       See Documentation/block/cfq-iosched.txt and
                        Documentation/block/deadline-iosched.txt for details.
  
 -      elfcorehdr=     [IA-64,PPC,SH,X86]
 +      elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
                        Specifies physical address of start of kernel core
 -                      image elf header. Generally kexec loader will
 -                      pass this option to capture kernel.
 +                      image elf header and optionally the size. Generally
 +                      kexec loader will pass this option to capture kernel.
                        See Documentation/kdump/kdump.txt for details.
  
        enable_mtrr_cleanup [X86]

diff --cc Documentation/laptops/thinkpad-acpi.txt
Simple merge

diff --cc Documentation/networking/scaling.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/io.h
Simple merge

diff --cc arch/arm/mach-omap2/smartreflex.c
Simple merge

diff --cc arch/arm/mach-pxa/xcep.c
Simple merge

diff --cc arch/arm/plat-mxc/Kconfig
index 502e45f03178a7e4821248eb85b30229ff84ad9c,4c8fdbcc94677900bf8e2a7a750bc8f963db9945..4bdc975581eb1d46d36fe18adbf82f864917f7ed
--- 1/arch/arm/plat-mxc/Kconfig
--- 2/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@@ -21,14 -34,20 +21,14 @@@ config ARCH_MX
        help
          This enables support for systems based on the Freescale i.MX3 family
  
 -config ARCH_MX503
 -      bool "i.MX50 + i.MX53"
 -      select ARCH_MX50_SUPPORTED
 -      select ARCH_MX53_SUPPORTED
 +config ARCH_MX5
 +      bool "i.MX50, i.MX51, i.MX53"
 +      select AUTO_ZRELADDR
 +      select ARM_PATCH_PHYS_VIRT
        help
-         This enables support for machines using Freescale's i.MX50 and i.MX51
+         This enables support for machines using Freescale's i.MX50 and i.MX53
          processors.
  
 -config ARCH_MX51
 -      bool "i.MX51"
 -      select ARCH_MX51_SUPPORTED
 -      help
 -        This enables support for systems based on the Freescale i.MX51 family
 -
  endchoice
  
  source "arch/arm/mach-imx/Kconfig"

diff --cc arch/powerpc/platforms/85xx/Kconfig
Simple merge

diff --cc drivers/block/drbd/drbd_int.h
Simple merge

diff --cc drivers/block/rbd.c
Simple merge

diff --cc drivers/block/xen-blkback/common.h
Simple merge

diff --cc drivers/ide/Kconfig
index ff7c6bbec2256e5dd31bef8d6a17a036838ab2e1,76b6d98bd29532ca0ce006ac675542dc13a3a102..5a26584934caa4c542f4a53582b5a03fcc28f634
--- 1/drivers/ide/Kconfig
--- 2/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@@ -681,8 -681,8 +681,8 @@@ config BLK_DEV_IDE_AU1XX
         select IDE_XFER_MODE
  choice
         prompt "IDE Mode for AMD Alchemy Au1200"
-        default CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA
+        default BLK_DEV_IDE_AU1XXX_PIO_DBDMA
 -       depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
 +       depends on BLK_DEV_IDE_AU1XXX
  
  config BLK_DEV_IDE_AU1XXX_PIO_DBDMA
         bool "PIO+DbDMA IDE for AMD Alchemy Au1200"

diff --cc drivers/media/dvb/dvb-usb/af9005.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/net/ethernet/atheros/atlx/atl1.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2.h
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/21142.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/eeprom.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/interrupt.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/media.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/pnic.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/pnic2.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/timer.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/tulip.h
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/tulip_core.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/e1000_mbx.c
Simple merge

diff --cc drivers/net/ethernet/intel/igbvf/mbx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/mbx.c
Simple merge

diff --cc drivers/net/ethernet/marvell/sky2.c
Simple merge

diff --cc drivers/net/ethernet/micrel/ks8695net.c
Simple merge

diff --cc drivers/net/ethernet/tile/tilepro.c
Simple merge

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
Simple merge

diff --cc drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

diff --cc drivers/scsi/isci/phy.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_ctl.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

diff --cc drivers/scsi/mvsas/mv_sas.h
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_conf.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_io.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/locks.c
Simple merge

diff --cc include/linux/ceph/messenger.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge