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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/inkern.c
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc drivers/staging/android/persistent_ram.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/ak8975.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/hmc5843.c
Simple merge

diff --cc drivers/staging/media/as102/as102_fw.c
Simple merge

diff --cc drivers/staging/octeon/ethernet-rx.c
Simple merge

diff --cc drivers/staging/octeon/ethernet-tx.c
Simple merge

diff --cc drivers/staging/octeon/ethernet.c
Simple merge

diff --cc drivers/staging/omapdrm/omap_drv.c
Simple merge

diff --cc drivers/staging/rts_pstor/ms.c
Simple merge

diff --cc drivers/staging/rts_pstor/rtsx_transport.c
Simple merge

diff --cc drivers/staging/sep/sep_main.c
Simple merge

diff --cc drivers/staging/vme/devices/vme_pio2_core.c
Simple merge

diff --cc drivers/staging/vt6656/ioctl.c
index d59456c29df15db61b310281841c16164e6cc4dc,cc7357d330b6af1199a96f0b7d277c09fe6503fc..5b9a84f95185358f69a27640d874f5b49f63d0a9
--- 1/drivers/staging/vt6656/ioctl.c
--- 2/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;

diff --cc drivers/staging/xgifb/vb_init.c
Simple merge

diff --cc drivers/staging/xgifb/vb_setmode.c
Simple merge

diff --cc drivers/staging/xgifb/vb_table.h
Simple merge

diff --cc drivers/staging/zsmalloc/zsmalloc-main.c
Simple merge