kernel-fxtec-pro1x/drivers/net/wimax/i2400m
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
control.c wimax: make functions local 2010-10-05 00:47:38 -07:00
debug-levels.h
debugfs.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
driver.c i2400m: drop i2400m_schedule_work() 2010-12-12 16:45:14 +01:00
fw.c
i2400m-sdio.h wimax: make functions local 2010-10-05 00:47:38 -07:00
i2400m-usb.h
i2400m.h i2400m: drop i2400m_schedule_work() 2010-12-12 16:45:14 +01:00
Kconfig
Makefile
netdev.c
op-rfkill.c
rx.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-10-11 12:30:34 -07:00
sdio-debug-levels.h
sdio-fw.c
sdio-rx.c wimax: make functions local 2010-10-05 00:47:38 -07:00
sdio-tx.c
sdio.c i2400m: drop i2400m_schedule_work() 2010-12-12 16:45:14 +01:00
sysfs.c
tx.c
usb-debug-levels.h
usb-fw.c
usb-notif.c
usb-rx.c
usb-tx.c
usb.c Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00