From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jan 2010 17:27:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.33-rc6~15
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=981a2edd1922c00e747680f30734ea50c86af28d

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] fix single stepped svcs with TRACE_IRQFLAGS=y
  [S390] zcrypt: Do not remove coprocessor for error 8/72
  [S390] sclp_vt220: set initial terminal window size
  [S390] use set_current_state in sigsuspend
  [S390] irqflags: add missing types.h include
  [S390] dasd: fix possible NULL pointer errors
---

981a2edd1922c00e747680f30734ea50c86af28d