Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 2e9be83a697f..944fc1203ebd 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -121,10 +121,9 @@ static int initialize_event_pool(struct event_pool *pool,
 
         pool->size = size;
         pool->next = 0;
-        pool->events = kmalloc(pool->size * sizeof(*pool->events), GFP_KERNEL);
+        pool->events = kcalloc(pool->size, sizeof(*pool->events), GFP_KERNEL);
         if (!pool->events)
                 return -ENOMEM;
-        memset(pool->events, 0x00, pool->size * sizeof(*pool->events));
 
         pool->iu_storage =
             dma_alloc_coherent(hostdata->dev,