Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jul 2015 19:18:40 +0000 (12:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jul 2015 19:18:40 +0000 (12:18 -0700)
commit9d634c410b07be7bf637ea03362d3ff132088fe3
treee775132f1020f6017ed608ad0b24ae7a27f254ff
parentd7f430d450d333cbb404e232fb1c74f31f8c6356
parent3827ec3d8fd51aef8352b0282b14f0f3ab615930
Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull s390 fix from Martin Schwidefsky:
 "Fast path fix for the thread_struct breakage"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: adapt entry.S to the move of thread_struct