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
..
2009-04-01 08:59:13 -07:00
2011-01-07 17:50:23 +11:00
2010-08-08 21:57:23 +01:00
2009-09-22 07:17:35 -07:00
2010-12-22 19:43:34 -08:00
2010-05-25 08:06:58 -07:00
2010-09-09 09:05:06 -07:00
2010-03-24 16:31:21 -07:00
2010-10-26 16:52:08 -07:00
2010-05-21 18:31:21 -04:00
2010-05-25 08:07:00 -07:00
2010-10-26 16:52:10 -07:00
2011-01-07 17:50:26 +11:00
2010-10-27 18:03:17 -07:00
2010-10-26 16:52:11 -07:00
2009-06-23 12:50:05 -07:00