projects / platform / kernel / linux-stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a94cc4e 8adb4ca)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Aug 2011 16:28:22 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Aug 2011 16:28:22 +0000 (09:28 -0700)
commit96d185c76584b285dbaf39e4399a9a690ce7aa6d
tree18fe9e8dc4ba0764e024fc534bf75b05d21af63etree | snapshot
parenta94cc4e6c0a26a7c8f79a432ab2c89534aa674d5commit | diff
parent8adb4ca344b48bbbf87ca66fd07a2dd503619714commit | diff
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
Domain: System / Kernel;