From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Sep 2012 00:01:31 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.6-rc4~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a492246c3439bf2ba454f566258212f7bbd310bb;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "A couple of s390 bug fixes for 3.5-rc4"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/32: Don't clobber personality flags on exec
  s390/smp: add missing smp_store_status() for !SMP
  s390/dasd: fix ioctl return value
  s390: Always use "long" for ssize_t to match size_t
---

a492246c3439bf2ba454f566258212f7bbd310bb