alistair23-linux/drivers/media/video/ivtv
Linus Torvalds 3b7433b8a8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)
  workqueue: mark init_workqueues() as early_initcall()
  workqueue: explain for_each_*cwq_cpu() iterators
  fscache: fix build on !CONFIG_SYSCTL
  slow-work: kill it
  gfs2: use workqueue instead of slow-work
  drm: use workqueue instead of slow-work
  cifs: use workqueue instead of slow-work
  fscache: drop references to slow-work
  fscache: convert operation to use workqueue instead of slow-work
  fscache: convert object to use workqueue instead of slow-work
  workqueue: fix how cpu number is stored in work->data
  workqueue: fix mayday_mask handling on UP
  workqueue: fix build problem on !CONFIG_SMP
  workqueue: fix locking in retry path of maybe_create_worker()
  async: use workqueue for worker pool
  workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead
  workqueue: implement unbound workqueue
  workqueue: prepare for WQ_UNBOUND implementation
  libata: take advantage of cmwq and remove concurrency limitations
  workqueue: fix worker management invocation without pending works
  ...

Fixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in
include/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c
2010-08-07 12:42:58 -07:00
..
ivtv-cards.c V4L/DVB: ivtv: Tweak Sony GigaPocket Kikyou card entry based on experiments 2010-02-26 15:11:07 -03:00
ivtv-cards.h V4L/DVB: ivtv: Add initial entry for Sony VAIO Giga Pocket (Kikyou) cards 2010-02-26 15:11:07 -03:00
ivtv-controls.c V4L/DVB: ivtv: convert to use s_mbus_fmt 2010-06-01 01:20:30 -03:00
ivtv-controls.h V4L/DVB (8113): ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrl 2008-07-20 07:12:23 -03:00
ivtv-driver.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2010-08-07 12:42:58 -07:00
ivtv-driver.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2010-08-07 12:42:58 -07:00
ivtv-fileops.c V4L/DVB: ivtv: Automatic firmware reload 2010-08-02 14:48:13 -03:00
ivtv-fileops.h V4L/DVB (10135): v4l2: introduce v4l2_file_operations. 2009-01-02 17:11:12 -02:00
ivtv-firmware.c V4L/DVB: ivtv: Automatic firmware reload 2010-08-02 14:48:13 -03:00
ivtv-firmware.h V4L/DVB: ivtv: Add firmare monitoring and debug mode to ignore firmware problems 2010-08-02 14:47:55 -03:00
ivtv-gpio.c V4L/DVB (12336): ivtv: Fix improper GPIO audio mux input switch on video standard change 2009-09-12 12:18:12 -03:00
ivtv-gpio.h V4L/DVB (9835): ivtv/ivtvfb: convert to v4l2_device/v4l2_subdev. 2008-12-30 09:38:44 -02:00
ivtv-i2c.c V4L/DVB: ir-core: Make use of the new IR keymap modules 2010-05-19 12:56:50 -03:00
ivtv-i2c.h V4L/DVB (13443): ivtv: Defer legacy I2C IR probing until after setup of known I2C devices 2009-12-05 18:41:56 -02:00
ivtv-ioctl.c V4L/DVB: ivtv: convert to use s_mbus_fmt 2010-06-01 01:20:30 -03:00
ivtv-ioctl.h V4L/DVB (9325): ivtv: switch to unlocked_ioctl. 2008-10-21 14:31:28 -02:00
ivtv-irq.c ivtv: use kthread_worker instead of workqueue 2010-06-29 10:07:09 +02:00
ivtv-irq.h ivtv: use kthread_worker instead of workqueue 2010-06-29 10:07:09 +02:00
ivtv-mailbox.c V4L/DVB: ivtv: Automatic firmware reload 2010-08-02 14:48:13 -03:00
ivtv-mailbox.h V4L/DVB: ivtv: Automatic firmware reload 2010-08-02 14:48:13 -03:00
ivtv-queue.c ivtv: Fix PCI DMA direction 2009-06-05 08:05:23 -07:00
ivtv-queue.h V4L/DVB (10488): ivtv: cleanup naming conventions 2009-03-30 12:42:41 -03:00
ivtv-routing.c V4L/DVB (11380): v4l2-subdev: change s_routing prototype 2009-04-06 21:44:27 -03:00
ivtv-routing.h V4L/DVB (6092): ivtv: more cleanups, merged ivtv-audio.c and ivtv-video.c into ivtv-routing.c 2007-10-09 22:06:47 -03:00
ivtv-streams.c V4L/DVB: ivtv: Automatic firmware reload 2010-08-02 14:48:13 -03:00
ivtv-streams.h V4L/DVB (7854): cx18/ivtv: improve and fix out-of-memory handling 2008-05-14 02:54:09 -03:00
ivtv-udma.c V4L/DVB: ivtv: Fix race condition for queued udma transfers 2010-02-26 15:10:41 -03:00
ivtv-udma.h V4L/DVB (10488): ivtv: cleanup naming conventions 2009-03-30 12:42:41 -03:00
ivtv-vbi.c V4L/DVB: v4l: move vbi-specific video ops to a new vbi ops struct 2010-05-19 12:58:45 -03:00
ivtv-vbi.h V4L/DVB (6116): ivtv: VBI cleanups and fixes 2007-10-09 22:07:14 -03:00
ivtv-version.h V4L/DVB: ivtv: Increment driver version due to firmware loading changes 2010-08-02 14:48:30 -03:00
ivtv-yuv.c V4L/DVB (11674): ivtv: fix incorrect bit tests 2009-05-09 18:53:10 -03:00
ivtv-yuv.h V4L/DVB (7963): ivtv: trivial annotations 2008-06-05 06:35:49 -03:00
ivtvfb.c V4L/DVB: VIDEO: ivtvfb, remove unneeded NULL test 2010-08-02 16:42:57 -03:00
Kconfig V4L/DVB (9486): ivtv/ivtvfb: no longer experimental 2008-11-11 08:11:25 -02:00
Makefile V4L/DVB(7767): Move tuners to common/tuners 2008-04-29 18:41:37 -03:00