Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	arch/arm/mach-shmobile/board-ap4evb.c
	arch/s390/include/asm/thread_info.h
	drivers/mfd/twl4030-irq.c

diff --cc arch/alpha/include/asm/thread_info.h
index ff73db022342f789124b484618251e8e6235c1c6,7e5510202d3792a8822b40108becc50ba1d0fa0d..28335bd40e406d54557fc17d7dbc15eae88d1a8d
--- 1/arch/alpha/include/asm/thread_info.h
--- 2/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@@ -74,12 -74,11 +74,11 @@@ register struct thread_info *__current_
  #define TIF_NEED_RESCHED      3       /* rescheduling necessary */
  #define TIF_POLLING_NRFLAG    8       /* poll_idle is polling NEED_RESCHED */
  #define TIF_DIE_IF_KERNEL     9       /* dik recursion lock */
 -#define TIF_UAC_NOPRINT               10      /* see sysinfo.h */
 -#define TIF_UAC_NOFIX         11
 -#define TIF_UAC_SIGBUS                12
 +#define TIF_UAC_NOPRINT               10      /* ! Preserve sequence of following */
 +#define TIF_UAC_NOFIX         11      /* ! flags as they match            */
 +#define TIF_UAC_SIGBUS                12      /* ! userspace part of 'osf_sysinfo' */
  #define TIF_MEMDIE            13      /* is terminating due to OOM killer */
  #define TIF_RESTORE_SIGMASK   14      /* restore signal mask in do_signal */
- #define TIF_FREEZE            16      /* is freezing for suspend */
  
  #define _TIF_SYSCALL_TRACE    (1<<TIF_SYSCALL_TRACE)
  #define _TIF_SIGPENDING               (1<<TIF_SIGPENDING)

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
index b622d8d3ab7297da7bd1b3d76ec8a89a55d5f00f,d6c8ae81317597a71d68f81fe8c400c956a61a22..241f8ea220776e024356d526e30d283c23f4456f
--- 1/arch/arm/mach-shmobile/board-ap4evb.c
--- 2/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@@ -42,7 -42,7 +42,8 @@@
  #include <linux/leds.h>
  #include <linux/input/sh_keysc.h>
  #include <linux/usb/r8a66597.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/pm_clock.h>
  
  #include <media/sh_mobile_ceu.h>
  #include <media/sh_mobile_csi2.h>

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/sh7372.h
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/include/asm/thread_info.h
index f9a9a10979c9bfe59838fd9904f647d529d4da1a,589708a461196c0e81899c56ad9dad39f7da2324..c6ce7ca49351daec2db696d2501d572c8728b225
--- 1/arch/s390/include/asm/thread_info.h
--- 2/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@@ -117,8 -116,7 +116,7 @@@ static inline struct thread_info *curre
  #define _TIF_SIE              (1<<TIF_SIE)
  #define _TIF_POLLING_NRFLAG   (1<<TIF_POLLING_NRFLAG)
  #define _TIF_31BIT            (1<<TIF_31BIT)
 -#define _TIF_SINGLE_STEP      (1<<TIF_FREEZE)
 +#define _TIF_SINGLE_STEP      (1<<TIF_SINGLE_STEP)
- #define _TIF_FREEZE           (1<<TIF_FREEZE)
  
  #ifdef CONFIG_64BIT
  #define is_32bit_task()               (test_thread_flag(TIF_31BIT))

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/mfd/twl6030-irq.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/gfs2/log.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

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

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge