From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2011 02:36:59 +0000 (+1000)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20110822~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a919ad99290514827b77909abdb72048b43aaf62;p=karo-tx-linux.git

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

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

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