linux/drivers/s390
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
..
block [S390] dasd: Correct retry counter for terminated I/O. 2011-01-05 12:47:30 +01:00
char Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -08:00
cio [S390] cio: fix ccwgroup unregistration race condition 2011-01-05 12:47:31 +01:00
crypto [S390] Handling of 4096 bit RSA keys in CRT format. 2011-01-05 12:47:27 +01:00
kvm [S390] irq: have detailed statistics for interrupt types 2011-01-05 12:47:25 +01:00
net Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-01-07 14:50:50 -08:00
scsi Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-01-07 14:50:50 -08:00
Makefile [S390] split/move machine check handler code 2009-03-26 15:24:10 +01:00