linux/drivers/media/video/saa7134
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 [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Makefile V4L/DVB: saa7134-input can't be a module right now 2010-10-21 01:16:52 -02:00
saa6752hs.c V4L/DVB: saa6752hs: remove obsolete v4l2-i2c-drv.h header 2010-10-21 01:05:59 -02:00
saa7134-alsa.c V4L/DVB: drivers/media: Remove unnecessary casts of private_data 2010-08-02 16:42:53 -03:00
saa7134-cards.c [media] saa7134: Add support for Compro VideoMate Vista M1F 2010-12-29 08:17:17 -02:00
saa7134-core.c 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
saa7134-dvb.c [media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG 2010-12-29 08:16:28 -02:00
saa7134-empress.c media/video: don't use flush_scheduled_work() 2010-12-24 16:14:20 +01:00
saa7134-i2c.c V4L/DVB: saa7134: get rid of I2C_HW_SAA7134 2010-10-21 01:06:07 -02:00
saa7134-input.c [media] saa7134: Add support for Compro VideoMate Vista M1F 2010-12-29 08:17:17 -02:00
saa7134-reg.h V4L/DVB: saa7134: Fix IRQ2 bit names for the register map 2010-05-19 12:56:52 -03:00
saa7134-ts.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
saa7134-tvaudio.c [media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses 2010-12-29 08:16:29 -02:00
saa7134-vbi.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
saa7134-video.c [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -02:00
saa7134.h [media] saa7134: Add support for Compro VideoMate Vista M1F 2010-12-29 08:17:17 -02:00