diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:11 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:11 -0700 | 
| commit | e4049eb8527668a6c7f97b944970b81d1316d5b0 (patch) | |
| tree | 6fd80493b42a95903a75d5d5b3e6aac19d9fa805 /drivers/net/wireless/hostap/hostap_main.c | |
| parent | 35d824b28fc5544d1eb7c1e3db15a1740df8ec4b (diff) | |
| parent | 8a3461e2cdb719ae4796feb70054f1597005af28 (diff) | |
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: (29 commits)
  USB: sl811-hcd: Fix device disconnect
  USB: ohci-at91: fix power management hanging
  USB: rename usb_buffer_alloc() and usb_buffer_free()
  USB: ti_usb: fix printk format warning
  USB: gadget: s3c-hsotg: Add missing unlock
  USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set
  USB: oxu210hp: release spinlock on error path
  USB: serial: option: add cinterion device id
  USB: serial: option: ZTEAC8710 Support with Device ID 0xffff
  USB: serial: pl2303: Hybrid reader Uniform HCR331
  USB: option: add ID for ZTE MF 330
  USB: xhci: properly set endpoint context fields for periodic eps.
  USB: xhci: properly set the "Mult" field of the endpoint context.
  USB: OHCI: don't look at the root hub to get the number of ports
  USB: don't choose configs with no interfaces
  USB: cdc-acm: add another device quirk
  USB: fix testing the wrong variable in fs_create_by_name()
  usb: Fix tusb6010 for DMA API
  musb_core: fix musb_init_controller() error cleanup path
  MUSB: fix DaVinci glue layer dependency
  ...
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_main.c')
0 files changed, 0 insertions, 0 deletions
