From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Mar 2012 17:57:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: daily-2013.07.26.0_rel-roth-mp-3-partner~2892^2~312
X-Git-Url: http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git;a=commitdiff_plain;h=59f2fe326666002f8387fb434a871815d3535f40

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

Pull s390 build fixes from Martin Schwidefsky.

More small fixes for the system.h disintegration.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] Fix build errors (fallout from system.h disintegration)
---

59f2fe326666002f8387fb434a871815d3535f40