From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Aug 2011 16:28:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: firefly_0821_release~3680^2~4555
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=96d185c76584b285dbaf39e4399a9a690ce7aa6d;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] memory hotplug: only unassign assigned increments
  [S390] Change default action from reipl to stop for on_restart
  [S390] arch/s390/kernel/ipl.c: correct error detection check
  [S390] drivers/s390/block/dasd_ioctl.c: add missing kfree
  [S390] nss,initrd: kernel image and initrd must be in different segments
---

96d185c76584b285dbaf39e4399a9a690ce7aa6d