From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Feb 2010 15:19:07 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: firefly_0821_release~9833^2~3202
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=909ccdb4cf9b2c3bfb803392e93c6195d2e68799;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] Fix struct _lowcore layout.
  [S390] qdio: prevent call trace if CHPID is offline
  [S390] qdio: continue polling for buffer state ERROR
---

909ccdb4cf9b2c3bfb803392e93c6195d2e68799