linux/drivers/staging/vt6656
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
..
80211hdr.h
80211mgr.c
80211mgr.h
aes_ccmp.c
aes_ccmp.h
baseband.c
baseband.h
bssdb.c
bssdb.h
card.c
card.h
channel.c
channel.h
control.c
control.h
country.h
datarate.c
datarate.h
desc.h
device.h
device_cfg.h
dpc.c
dpc.h
firmware.c staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
firmware.h
hostap.c staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
hostap.h
int.c
int.h
iocmd.h
ioctl.c
ioctl.h
iowpa.h
iwctl.c
iwctl.h
Kconfig Staging: vt665?: prevent modules from being built into the kernel. 2011-04-04 21:33:26 -07:00
key.c
key.h
mac.c
mac.h
main_usb.c staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
Makefile
mib.c
mib.h
michael.c
michael.h
power.c Staging: vt6656: Clean up switching to power saving mode. 2011-03-02 15:52:30 -05:00
power.h
rc4.c
rc4.h
rf.c
rf.h
rndis.h
rxtx.c Fix common misspellings 2011-03-31 11:26:23 -03:00
rxtx.h
srom.h
tcrc.c
tcrc.h
tether.c
tether.h
tkip.c
tkip.h
tmacro.h
TODO
ttype.h
upc.h
usbpipe.c
usbpipe.h
vntconfiguration.dat
wcmd.c Fix common misspellings 2011-03-31 11:26:23 -03:00
wcmd.h
wctl.c
wctl.h
wmgr.c
wmgr.h Fix common misspellings 2011-03-31 11:26:23 -03:00
wpa.c
wpa.h
wpa2.c
wpa2.h
wpactl.c staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
wpactl.h