diff options
| author | Linus Torvalds | 2011-08-26 09:28:22 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-08-26 09:28:22 -0700 |
| commit | 96d185c76584b285dbaf39e4399a9a690ce7aa6d (patch) | |
| tree | 18fe9e8dc4ba0764e024fc534bf75b05d21af63e /init | |
| parent | a94cc4e6c0a26a7c8f79a432ab2c89534aa674d5 (diff) | |
| parent | 8adb4ca344b48bbbf87ca66fd07a2dd503619714 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions