Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - Documentation/feature-removal-schedule.txt
 - drivers/staging/bcm/headers.h
 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
 - drivers/staging/brcm80211/brcmfmac/wl_iw.c
 - drivers/staging/et131x/et131x_netdev.c
 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
 - drivers/staging/rtl8192e/r8192E.h
 - drivers/staging/usbip/userspace/src/utils.h

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/staging/ath6kl/os/linux/cfg80211.c
	drivers/staging/bcm/headers.h
	drivers/staging/brcm80211/brcmfmac/dhd_linux.c
	drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
	drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
	drivers/staging/brcm80211/brcmfmac/wl_iw.c
	drivers/staging/brcm80211/brcmsmac/bmac.c
	drivers/staging/brcm80211/brcmsmac/wlc_bmac.h
	drivers/staging/et131x/et131x_netdev.c
	drivers/staging/msm/ebi2_l2f.c
	drivers/staging/msm/ebi2_lcd.c
	drivers/staging/msm/ebi2_tmd20.c
	drivers/staging/msm/hdmi_sii9022.c
	drivers/staging/msm/lcdc.c
	drivers/staging/msm/lcdc_external.c
	drivers/staging/msm/lcdc_gordon.c
	drivers/staging/msm/lcdc_panel.c
	drivers/staging/msm/lcdc_prism.c
	drivers/staging/msm/lcdc_sharp_wvga_pt.c
	drivers/staging/msm/lcdc_st15.c
	drivers/staging/msm/lcdc_toshiba_wvga_pt.c
	drivers/staging/msm/mddi.c
	drivers/staging/msm/mddi_ext.c
	drivers/staging/msm/mddi_ext_lcd.c
	drivers/staging/msm/mddi_prism.c
	drivers/staging/msm/mddi_sharp.c
	drivers/staging/msm/mddi_toshiba.c
	drivers/staging/msm/mddi_toshiba_vga.c
	drivers/staging/msm/mddi_toshiba_wvga_pt.c
	drivers/staging/msm/mddihost.c
	drivers/staging/msm/mddihost_e.c
	drivers/staging/msm/mddihosti.c
	drivers/staging/msm/mdp.c
	drivers/staging/msm/mdp4_debugfs.c
	drivers/staging/msm/mdp4_overlay.c
	drivers/staging/msm/mdp4_overlay_lcdc.c
	drivers/staging/msm/mdp4_overlay_mddi.c
	drivers/staging/msm/mdp4_util.c
	drivers/staging/msm/mdp_cursor.c
	drivers/staging/msm/mdp_dma.c
	drivers/staging/msm/mdp_dma_lcdc.c
	drivers/staging/msm/mdp_dma_s.c
	drivers/staging/msm/mdp_dma_tv.c
	drivers/staging/msm/mdp_hw_init.c
	drivers/staging/msm/mdp_ppp_dq.c
	drivers/staging/msm/mdp_ppp_v20.c
	drivers/staging/msm/mdp_ppp_v31.c
	drivers/staging/msm/mdp_vsync.c
	drivers/staging/msm/memory_ll.h
	drivers/staging/msm/msm_fb_bl.c
	drivers/staging/msm/msm_fb_panel.c
	drivers/staging/msm/staging-devices.c
	drivers/staging/msm/tv_ntsc.c
	drivers/staging/msm/tv_pal.c
	drivers/staging/msm/tvenc.c
	drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
	drivers/staging/rtl8192e/r8192E.h
	drivers/staging/usbip/usbip_common.h
	drivers/staging/usbip/userspace/src/utils.h