kernel-fxtec-pro1x/drivers/staging/rtl8192e
Linus Torvalds df9b29d13e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
2011-04-07 11:36:44 -07:00
..
ieee80211 Fix common misspellings 2011-03-31 11:26:23 -03:00
dot11d.h Staging: rtl8192e: Convert cpMacAddr macro to inline function 2011-01-20 16:14:10 -08: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
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
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
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
r8192E.h staging: rtl8192e: Pass priv to cmdpkt functions 2011-03-14 12:24:48 -07:00
r8192E_core.c staging: rtl8192e: Don't copy dev pointer to skb 2011-03-14 12:24:48 -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