From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jan 2010 20:32:42 +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~3484
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=741f21e811752b440c505bf0149c4d16e9f3160d;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] Update default configuration.
  [S390] Have param.h simply include <asm-generic/param.h>.
  [S390] qdio: convert global statistics to per-device stats
---

741f21e811752b440c505bf0149c4d16e9f3160d