linux/drivers/staging/rtl8192e
Linus Torvalds 1380516599 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
2011-07-25 23:26:34 -07:00
..
ieee80211 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
Kconfig staging/rtl81*: build as loadable modules only 2011-04-04 22:46:15 -07:00
Makefile Staging: rtl8192e: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
dot11d.h Staging: rtl8192e: Fixed numerous coding style issues 2011-06-28 14:33:37 -07:00
r819xE_cmdpkt.c staging: rtl8192e: Don't copy dev pointer to skb 2011-03-14 12:24:48 -07:00
r819xE_cmdpkt.h staging: rtl8192e: Pass priv to cmdpkt functions 2011-03-14 12:24:48 -07:00
r819xE_firmware.c staging: rtl8192e: Don't copy dev pointer to skb 2011-03-14 12:24:48 -07:00
r819xE_phy.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r819xE_phy.h staging: rtl8192e: Pass ieee80211_device to callbacks 2011-03-14 12:24:46 -07:00
r819xE_phyreg.h Staging: rtl8192e: Code style fix for r819xE_phyreg.h 2010-03-03 16:42:30 -08:00
r8180_93cx6.c staging: rtl8192e: Pass r8192_priv to eprom_read 2011-03-07 13:31:43 -08:00
r8180_93cx6.h staging: rtl8192e: Pass r8192_priv to eprom_read 2011-03-07 13:31:43 -08:00
r8190_rtl8256.c staging: rtl8192e: Pass r8192_priv to MgntActSet_RF_State 2011-03-07 13:31:45 -08:00
r8190_rtl8256.h staging: rtl8192e: Pass r8192_priv to MgntActSet_RF_State 2011-03-07 13:31:45 -08:00
r8192E.h Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
r8192E_core.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
r8192E_dm.c staging: rtl8192e: Pass priv to cmdpkt functions 2011-03-14 12:24:48 -07:00
r8192E_dm.h staging: rtl8192e: Pass rtl8192_priv to dm functions 2011-03-14 12:24:47 -07:00
r8192E_hw.h staging: rtl8192e: Delete dead code 2011-03-14 12:24:43 -07:00
r8192E_wx.c staging: rtl8192e: Pass ieee80211_device to callbacks 2011-03-14 12:24:45 -07:00
r8192E_wx.h staging: rtl8192e: Make functions static 2011-02-23 14:10:09 -08:00
r8192_pm.c staging: rtl8192e: Pass r8192_priv to MgntActSet_RF_State 2011-03-07 13:31:45 -08:00
r8192_pm.h Staging: rtl8192e: Use the standard config option for PM functions 2010-05-11 11:35:56 -07:00