Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/Kconfig
	drivers/Makefile
	drivers/staging/android/Kconfig
	drivers/staging/android/Makefile
	drivers/staging/line6/driver.c
	drivers/staging/vt6656/ioctl.c

diff --cc drivers/Kconfig
index 0233ad979b7d75564531ca3ce119aec17758ff20,e245779443da2a120f42afab2d7f9a438637693d..57d6fd6074f7172c3e03f52f2af5514bbe58d885
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -140,8 +140,10 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
+ source "drivers/iio/Kconfig"
+ 
+ source "drivers/vme/Kconfig"
+ 
  endmenu

diff --cc drivers/Makefile
index c41dfa92cd793b83ab23d2b7068dea4d4b879f2f,08b78e035468c1b0cbbcf7e1504d9cbd90a1732e..6f30c1135744029b90e81984554698bfe090a848
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -134,4 -134,5 +134,6 @@@ obj-$(CONFIG_VIRT_DRIVERS) += virt
  obj-$(CONFIG_HYPERV)          += hv/
  
  obj-$(CONFIG_PM_DEVFREQ)      += devfreq/
 +obj-$(CONFIG_EXTCON)          += extcon/
+ obj-$(CONFIG_IIO)             += iio/
+ obj-$(CONFIG_VME_BUS)         += vme/

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

diff --cc drivers/staging/android/Kconfig
index c706635f3f8225dc9d5534fdf2f8f0b5952a34b8,84ac619ba87ae8120859b7a7a435b39eff8fe9af..42f0133826a7adb4604cc852d30740da2654b62a
--- 1/drivers/staging/android/Kconfig
--- 2/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -53,7 -52,9 +53,7 @@@ config ANDROID_LOW_MEMORY_KILLE
        ---help---
          Register processes to be killed when memory is low
  
- config ANDROID_INTF_ALARM
 -source "drivers/staging/android/switch/Kconfig"
 -
+ config ANDROID_INTF_ALARM_DEV
        bool "Android alarm driver"
        depends on RTC_CLASS
        default n

diff --cc drivers/staging/android/Makefile
index 045d17bde5243f02ee4356415d402cc7ee1595bc,b4be69f80d78210c6e9472da5e6a62eb15b2fb43..2de5c1019e95a4386f3d426068c4bd7dbfa50eaf
--- 1/drivers/staging/android/Makefile
--- 2/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -6,5 -6,5 +6,4 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)        += ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)    += timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)      += timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)       += lowmemorykiller.o
- obj-$(CONFIG_ANDROID_INTF_ALARM)      += alarm.o
 -obj-$(CONFIG_ANDROID_SWITCH)          += switch/
  obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)  += alarm-dev.o

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_usb_drv.c
Simple merge

diff --cc drivers/staging/media/go7007/s2250-loader.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/ramster/cluster/tcp.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