From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Feb 2013 00:16:29 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0e5056e3b733ecb7d3089f8e1e6529525490ab9;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

Pull s390 regression fix from Martin Schwidefsky:
 "The recent fix for the s390 sched_clock() function uncovered yet
  another bug in s390_next_ktime which causes an endless loop in KVM.
  This regression should be fixed before v3.8.

  I keep the fingers crossed that this is the last one for v3.8."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/timer: avoid overflow when programming clock comparator
---

a0e5056e3b733ecb7d3089f8e1e6529525490ab9