1
0
Fork 0
alistair23-linux/drivers/staging/rtl8192u
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
Kconfig staging/rtl81*: build as loadable modules only 2011-04-04 22:46:15 -07:00
Makefile Staging: rtl8192u: remove dead code to disable dot11d 2010-12-01 14:51:16 -08:00
authors
changes
copying
dot11d.h Staging: rtl8192u: remove dead code to disable dot11d 2010-12-01 14:51:16 -08:00
ieee80211_crypt.h Staging: rtl8192u: fix space coding style issue in ieee80211_crypt.h 2010-05-11 11:35:55 -07:00
r819xU_HTGen.h
r819xU_HTType.h Fix common misspellings 2011-03-31 11:26:23 -03:00
r819xU_cmdpkt.c Staging: drop redundant memset 2010-05-11 11:35:34 -07:00
r819xU_cmdpkt.h Staging: rtl8192u: remove dead code 2009-12-11 12:23:22 -08:00
r819xU_firmware.c rtl8192u_usb: Remove built-in firmware images 2011-01-21 12:19:11 -08:00
r819xU_firmware.h Staging: rtl8192u: remove dead code 2009-12-11 12:23:22 -08:00
r819xU_firmware_img.c rtl8192u_usb: Remove built-in firmware images 2011-01-21 12:19:11 -08:00
r819xU_firmware_img.h rtl8192u_usb: Remove built-in firmware images 2011-01-21 12:19:11 -08:00
r819xU_phy.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r819xU_phy.h Staging: rtl8192u: remove dead code 2009-12-11 12:23:22 -08:00
r819xU_phyreg.h Staging: rtl8192u: remove bad whitespaces 2009-12-11 12:23:22 -08:00
r8180_93cx6.c
r8180_93cx6.h
r8180_pm.c Staging: rtl8192u: remove bad whitespaces 2009-12-11 12:23:22 -08:00
r8180_pm.h
r8190_rtl8256.c
r8190_rtl8256.h
r8192U.h rtl8192u_usb: Remove built-in firmware images 2011-01-21 12:19:11 -08:00
r8192U_core.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r8192U_dm.c Staging: rtl8192u: remove dead code 2009-12-11 12:23:22 -08:00
r8192U_dm.h Staging: rtl8192u: remove dead code 2009-12-11 12:23:22 -08:00
r8192U_hw.h Staging: rtl8192u: remove dead code 2009-12-11 12:23:22 -08:00
r8192U_wx.c Staging: rtl8192u: remove dead code to disable dot11d 2010-12-01 14:51:16 -08:00
r8192U_wx.h Staging: rtl8192u: remove a copy of 80211.h 2010-07-08 13:25:30 -07:00