Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging tree update from Greg Kroah-Hartman:
 "Here's the big staging tree merge for 3.9-rc1

  Lots of cleanups and updates for drivers all through the staging tree.
  We are pretty much "code neutral" here, adding just about as many
  lines as we removed.

  All of these have been in linux-next for a while."

* tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
  staging: comedi: vmk80xx: wait for URBs to complete
  staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
  staging: et131x: Update TODO list
  staging: et131x: Remove assignment of skb->dev
  staging: wlan-ng: hfa384x.h: fix for error reported by smatch
  staging/zache checkpatch ERROR: spaces prohibited around that
  staging/ozwpan: Mark read only parameters and structs as const
  staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
  staging/ozwpan: Mark local functions as static (fix sparse warnings)
  staging/ozwpan: Add missing header includes
  staging/usbip: Mark local functions as static (fix sparse warnings)
  staging/xgifb: Remove duplicated code in loops.
  staging/xgifb: Consolidate return paths
  staging/xgifb: Remove code without effect
  staging/xgifb: Remove unnecessary casts
  staging/xgifb: Consolidate if/else if with identical code branches
  staging: vt6656: replaced custom TRUE definition with true
  staging: vt6656: replaced custom FALSE definition with false
  staging: vt6656: replace custom BOOL definition with bool
  staging/rtl8187se: Mark functions as static to silence sparse
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/power/generic-adc-battery.c
index 836816b,42733c4..8cb5d7f
--- 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/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/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 include/linux/pci_ids.h
Simple merge

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