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

Conflicts:
	drivers/staging/et131x/et131x.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 1a2c4db13e3268b79d740b104e4028e45c996bd2,f3d075baebb6232f70c8c25bd4f9b2922b47655e..ef614d2e0b199f77c7e97685849454aefd8d8ce0
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -40,9 -40,9 +40,9 @@@
  #include <sound/tpa6130a2-plat.h>
  #include <media/radio-si4713.h>
  #include <media/si4713.h>
 -#include <linux/leds-lp5523.h>
 +#include <linux/platform_data/leds-lp55xx.h>
  
- #include <../drivers/staging/iio/light/tsl2563.h>
+ #include <linux/platform_data/tsl2563.h>
  #include <linux/lis3lv02d.h>
  
  #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)

diff --cc drivers/gpu/drm/omapdrm/omap_connector.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_crtc.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_drv.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_encoder.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_fb.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_fbdev.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_plane.c
Simple merge

diff --cc drivers/power/generic-adc-battery.c
index 836816b82cbc46d336c3dd79adc90393b6ca7e39,42733c4dcb0eb1ea0fbc3e6c861c232fbaa722df..8cb5d7f67acebac1e60cf5006ae857835e8161cb
--- 1/drivers/power/generic-adc-battery.c
--- 2/drivers/power/generic-adc-battery.c
+++ b/drivers/power/generic-adc-battery.c
@@@ -284,11 -287,10 +284,11 @@@ static int gab_probe(struct platform_de
         * based on the channel supported by consumer device.
         */
        for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
-               adc_bat->channel[chan] = iio_channel_get(dev_name(&pdev->dev),
-                                               gab_chan_name[chan]);
+               adc_bat->channel[chan] = iio_channel_get(&pdev->dev,
+                                                        gab_chan_name[chan]);
                if (IS_ERR(adc_bat->channel[chan])) {
                        ret = PTR_ERR(adc_bat->channel[chan]);
 +                      adc_bat->channel[chan] = NULL;
                } else {
                        /* copying properties for supported channels only */
                        memcpy(properties + sizeof(*(psy->properties)) * index,

diff --cc drivers/power/lp8788-charger.c
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/rtc/Makefile
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/android/binder.h
Simple merge

diff --cc drivers/staging/csr/unifi_sme.c
Simple merge

diff --cc drivers/staging/et131x/et131x.c
Simple merge

diff --cc drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Simple merge

diff --cc drivers/staging/fwserial/fwserial.c
Simple merge

diff --cc drivers/staging/iio/adc/mxs-lradc.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
Simple merge

diff --cc drivers/staging/omap-thermal/omap-bandgap.c
Simple merge

diff --cc drivers/staging/speakup/selection.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/linux/spi/spi.h
Simple merge