Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Mar 2012 17:57:40 +0000 (10:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Mar 2012 17:57:40 +0000 (10:57 -0700)
commit59f2fe326666002f8387fb434a871815d3535f40
tree4808568861b1a1ec501c89476a105f14acb24818
parent307cc7904841fd66a848ece16a179b49ae1a4ba4
parent1e3cab2f2fbca25289094698fd1280ecfad7a8d4
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)