From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2011 05:24:33 +0000 (+1000)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20110905~27
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=99784e4ff72260ab66cc1d10b94c3db4f226653c;p=karo-tx-linux.git

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
---

99784e4ff72260ab66cc1d10b94c3db4f226653c
diff --cc arch/alpha/include/asm/thread_info.h
index ff73db022342,7e5510202d37..28335bd40e40
--- a/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 b622d8d3ab72,d6c8ae813175..241f8ea22077
--- a/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/s390/include/asm/thread_info.h
index f9a9a10979c9,589708a46119..c6ce7ca49351
--- a/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))