From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 May 2010 01:47:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ec390e046039942d59ef2634b967b8b23fc57c2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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] correct address of _stext with CONFIG_SHARED_KERNEL=y
  [S390] ptrace: fix return value of do_syscall_trace_enter()
  [S390] dasd: fix race between tasklet and dasd_sleep_on
---

5ec390e046039942d59ef2634b967b8b23fc57c2