linux_old1/drivers/usb/atm
Linus Torvalds 23d69b09b7 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
  usb: don't use flush_scheduled_work()
  speedtch: don't abuse struct delayed_work
  media/video: don't use flush_scheduled_work()
  media/video: explicitly flush request_module work
  ioc4: use static work_struct for ioc4_load_modules()
  init: don't call flush_scheduled_work() from do_initcalls()
  s390: don't use flush_scheduled_work()
  rtc: don't use flush_scheduled_work()
  mmc: update workqueue usages
  mfd: update workqueue usages
  dvb: don't use flush_scheduled_work()
  leds-wm8350: don't use flush_scheduled_work()
  mISDN: don't use flush_scheduled_work()
  macintosh/ams: don't use flush_scheduled_work()
  vmwgfx: don't use flush_scheduled_work()
  tpm: don't use flush_scheduled_work()
  sonypi: don't use flush_scheduled_work()
  hvsi: don't use flush_scheduled_work()
  xen: don't use flush_scheduled_work()
  gdrom: don't use flush_scheduled_work()
  ...

Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
2011-01-07 16:58:04 -08:00
..
Kconfig USB: Remove redundant dependencies on USB_ATM. 2008-05-02 10:25:57 -07:00
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
cxacru.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
speedtch.c usb: don't use flush_scheduled_work() 2010-12-24 16:14:20 +01:00
ueagle-atm.c ueagle-atm: fix PHY signal initialization race 2010-12-28 13:41:41 -08:00
usbatm.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
usbatm.h usb: atm: fixed spacing and indentation coding style issues 2010-08-10 14:35:35 -07:00
xusbatm.c usb: atm: fixed spacing and indentation coding style issues 2010-08-10 14:35:35 -07:00