* debian/changelog: Update.
* debian/config/s390/config: Enable ZVM_WATCHDOG. svn path=/dists/trunk/linux-2.6/; revision=14780
This commit is contained in:
parent
cf310f7fad
commit
a9bc22a7b3
|
@ -4,7 +4,9 @@ linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
|
||||||
* Allow memory hot-add and -remove if possible.
|
* Allow memory hot-add and -remove if possible.
|
||||||
* Enable USB suspend.
|
* Enable USB suspend.
|
||||||
* Enable kernel samepage merging. (closes: #558200)
|
* Enable kernel samepage merging. (closes: #558200)
|
||||||
* [s390] Enable SECCOMP.
|
* [s390]
|
||||||
|
- Enable SECCOMP.
|
||||||
|
- Enable z/VM Watchdog Timer.
|
||||||
|
|
||||||
[ Moritz Muehlenhoff ]
|
[ Moritz Muehlenhoff ]
|
||||||
* Disable cryptoloop (Closes: #559755)
|
* Disable cryptoloop (Closes: #559755)
|
||||||
|
|
|
@ -129,6 +129,11 @@ CONFIG_QETH_L3=m
|
||||||
# CONFIG_SCSI_DEBUG is not set
|
# CONFIG_SCSI_DEBUG is not set
|
||||||
CONFIG_ZFCP=m
|
CONFIG_ZFCP=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/watchdog/Kconfig
|
||||||
|
##
|
||||||
|
CONFIG_ZVM_WATCHDOG=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: fs/partitions/Kconfig
|
## file: fs/partitions/Kconfig
|
||||||
##
|
##
|
||||||
|
|
Loading…
Reference in New Issue