Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index afc4e88551ad..8e3053c2a451 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -826,17 +826,15 @@ io_subchannel_probe (struct subchannel *sch)
                         get_device(&cdev->dev);
                 return 0;
         }
-        cdev  = kmalloc (sizeof(*cdev), GFP_KERNEL);
+        cdev = kzalloc (sizeof(*cdev), GFP_KERNEL);
         if (!cdev)
                 return -ENOMEM;
-        memset(cdev, 0, sizeof(struct ccw_device));
-        cdev->private = kmalloc(sizeof(struct ccw_device_private), 
+        cdev->private = kzalloc(sizeof(struct ccw_device_private),
                                 GFP_KERNEL | GFP_DMA);
         if (!cdev->private) {
                 kfree(cdev);
                 return -ENOMEM;
         }
-        memset(cdev->private, 0, sizeof(struct ccw_device_private));
         atomic_set(&cdev->private->onoff, 0);
         cdev->dev = (struct device) {
                 .parent = &sch->dev,