Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: rspiusb: Fix buffer overflow
  staging: add dependencies on PCI for drivers that require it
  Staging: rtl8192su: fix build error
  Staging: rt2870: Revert d44ca7 Removal of kernel_thread() API
  Staging: rt2870: Add USB ID for Linksys, Planex Communications, Belkin

...

This commit is contained in:

Linus Torvalds 2009-08-07 19:06:13 -07:00

parent b32b8e645e 749d00dbf1

commit 710ad849ae

12 changed files with 80 additions and 58 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/staging/b3dfg/Kconfig

View file

1

drivers/staging/heci/Kconfig

View file

2

drivers/staging/rspiusb/rspiusb.c

View file

13

drivers/staging/rt2860/rt_linux.h

View file

67

drivers/staging/rt2870/2870_main_dev.c

View file

33

drivers/staging/rt2870/common/2870_rtmp_init.c

View file

3

drivers/staging/rt2870/common/rtusb_io.c

View file

9

drivers/staging/rt2870/rt2870.h

View file

2

drivers/staging/rtl8192su/ieee80211.h

View file

2

drivers/staging/rtl8192su/ieee80211/ieee80211.h

View file

3

drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c

View file

2

drivers/staging/rtl8192su/r8192U_core.c

View file