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

diff --cc arch/arm/plat-s3c24xx/dma.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/si.c
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/media/dvb-frontends/drxk_hard.c
Simple merge

diff --cc drivers/media/platform/mx2_emmaprp.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

diff --cc drivers/mtd/nand/s3c2410.c
Simple merge

diff --cc drivers/net/bonding/bonding.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/eq.c
Simple merge

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

diff --cc drivers/regulator/palmas-regulator.c
Simple merge

diff --cc drivers/s390/block/dasd_devmap.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_configfs.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_util.c
Simple merge

diff --cc drivers/thermal/Kconfig
index 8636fae1f7ecfa88909b5b4aa7eb39b71722933f,d673ffca87c96722e692ab6042e44ad6f75edd76..c2c77d1ac499d3ccb4d4c141d66986e88e980bf6
--- 1/drivers/thermal/Kconfig
--- 2/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -95,31 -50,8 +95,31 @@@ config RCAR_THERMA
  
  config EXYNOS_THERMAL
        tristate "Temperature sensor on Samsung EXYNOS"
 -      depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL
 -      select CPU_FREQ_TABLE
 +      depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5)
 +      depends on CPU_THERMAL
        help
-         If you say yes here you get support for TMU (Thermal Managment
+         If you say yes here you get support for TMU (Thermal Management
          Unit) on SAMSUNG EXYNOS series of SoC.
 +
 +config DB8500_THERMAL
 +      bool "DB8500 thermal management"
 +      depends on ARCH_U8500
 +      default y
 +      help
 +        Adds DB8500 thermal management implementation according to the thermal
 +        management framework. A thermal zone with several trip points will be
 +        created. Cooling devices can be bound to the trip points to cool this
 +        thermal zone if trip points reached.
 +
 +config DB8500_CPUFREQ_COOLING
 +      tristate "DB8500 cpufreq cooling"
 +      depends on ARCH_U8500
 +      depends on CPU_THERMAL
 +      default y
 +      help
 +        Adds DB8500 cpufreq cooling devices, and these cooling devices can be
 +        bound to thermal zone trip points. When a trip point reached, the
 +        bound cpufreq cooling device turns active to set CPU frequency low to
 +        cool down the CPU.
 +
 +endif

diff --cc drivers/vhost/tcm_vhost.c
Simple merge

diff --cc fs/ext4/ext4.h
index f7dfdd2c81189b59ebed15d8b5d5f08004f31140,df163da388c9ccfe82348c51be596c9fcfd8cc55..b1a169ac6909142556e1cdb5124686cabf16d6c7
--- 1/fs/ext4/ext4.h
--- 2/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -2566,9 -2452,10 +2566,9 @@@ enum ext4_state_bits 
  
  BUFFER_FNS(Uninit, uninit)
  TAS_BUFFER_FNS(Uninit, uninit)
 -BUFFER_FNS(Da_Mapped, da_mapped)
  
  /*
-  * Add new method to test wether block and inode bitmaps are properly
+  * Add new method to test whether block and inode bitmaps are properly
   * initialized. With uninit_bg reading the block from disk is not enough
   * to mark the bitmap uptodate. We need to also zero-out the bitmap
   */

diff --cc fs/fhandle.c
Simple merge

diff --cc fs/jbd/transaction.c
Simple merge

diff --cc fs/jbd2/transaction.c
Simple merge

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

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

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

diff --cc include/net/sock.h
Simple merge

diff --cc lib/Kconfig.debug
index e27de94248d95556d59716eb1bdcf3f360af7d85,cba01d71db8621d64c75213e0b792f36c9fb40ff..88806b4ed69c889cc09d89af9e98d4a397b9d0ff
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1195,9 -1195,8 +1195,9 @@@ config MEMORY_NOTIFIER_ERROR_INJEC
  config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
        tristate "pSeries reconfig notifier error injection module"
        depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION
 +      depends on BROKEN
        help
-         This option provides the ability to inject artifical errors to
+         This option provides the ability to inject artificial errors to
          pSeries reconfig notifier chain callbacks.  It is controlled
          through debugfs interface under
          /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/

diff --cc mm/memory_hotplug.c
Simple merge

diff --cc net/ipv4/tcp_cong.c
Simple merge

diff --cc net/mac80211/driver-ops.h
Simple merge

diff --cc net/sctp/endpointola.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc sound/pci/es1968.c
Simple merge

diff --cc sound/pci/ice1712/delta.c
Simple merge