From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 May 2012 18:48:07 +0000 (-0700)
Subject: Merge 3.4-rc5 into staging-next
X-Git-Tag: v3.12-rc1~3149^2~229
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d210267741fb2a8b6d741d9040703683a39087f4;p=kernel%2Fkernel-generic.git

Merge 3.4-rc5 into staging-next

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

d210267741fb2a8b6d741d9040703683a39087f4
diff --cc drivers/staging/vt6656/ioctl.c
index d59456c,cc7357d..5b9a84f
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@@ -565,7 -565,7 +565,7 @@@ int private_ioctl(PSDevice pDevice, str
  			result = -ENOMEM;
  			break;
  		}
- 		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
 -		pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
++		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
  		if (pNodeList == NULL) {
  			result = -ENOMEM;
  			break;