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

Conflicts:
	arch/s390/include/asm/thread_info.h

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

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
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/net/ethernet/intel/e1000e/netdev.c
Simple merge

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

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

diff --cc fs/xfs/xfs_buf.c
Simple merge

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

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