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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (123 commits)
  wimax/i2400m: add CREDITS and MAINTAINERS entries
  wimax: export linux/wimax.h and linux/wimax/i2400m.h with headers_install
  i2400m: Makefile and Kconfig
  i2400m/SDIO: TX and RX path backends
  i2400m/SDIO: firmware upload backend
  i2400m/SDIO: probe/disconnect, dev init/shutdown and reset backends
  i2400m/SDIO: header for the SDIO subdriver
  i2400m/USB: TX and RX path backends
  i2400m/USB: firmware upload backend
  i2400m/USB: probe/disconnect, dev init/shutdown and reset backends
  i2400m/USB: header for the USB bus driver
  i2400m: debugfs controls
  i2400m: various functions for device management
  i2400m: RX and TX data/control paths
  i2400m: firmware loading and bootrom initialization
  i2400m: linkage to the networking stack
  i2400m: Generic probe/disconnect, reset and message passing
  i2400m: host/device procotol and core driver definitions
  i2400m: documentation and instructions for usage
  wimax: Makefile, Kconfig and docbook linkage for the stack
  ...
This commit is contained in:
Linus Torvalds 2009-01-07 15:37:24 -08:00
commit 7c7758f99d
186 changed files with 28282 additions and 1390 deletions

17
CREDITS
View file

@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr.
S: Nampa, Idaho 83686
S: USA
N: Dirk J. Brandewie
E: [email protected]
E: [email protected]
D: Intel Wireless WiMAX Connection 2400 SDIO driver
N: Derrick J. Brashear
E: [email protected]
W: http://www.dementia.org/~shadow
@ -2119,6 +2124,11 @@ N: H.J. Lu
E: [email protected]
D: GCC + libraries hacker
N: Yanir Lubetkin
E: [email protected]
E: [email protected]
D: Intel Wireless WiMAX Connection 2400 driver
N: Michal Ludvig
E: [email protected]
E: [email protected]
@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road
S: Thunder Bay, Ontario
S: CANADA P7C 5M9
N: Inaky Perez-Gonzalez
E: [email protected]
E: [email protected]
E: [email protected]
D: WiMAX stack
D: Intel Wireless WiMAX Connection 2400 driver
N: Yuri Per
E: [email protected]
D: Some smbfs fixes