From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Nov 2014 20:13:52 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v3.18-rc4~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90f95768447e040af96d3bfdaf5c64b407ae3dca;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

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

Pull s390 update from Martin Schwidefsky:
 "One small improvement for the cputime accounting, two bug fixes and an
  update for the default configuration files"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ftrace: add ftrace_graph_is_dead() check
  s390: update default configuration
  s390/vdso: fix stack corruption
  s390/time: use stck clock fast for do_account_vtime
---

90f95768447e040af96d3bfdaf5c64b407ae3dca