kernel-fxtec-pro1x/drivers/media/video/cx23885
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
..
cimax2.c [media] cx23885, cimax2.c: Fix case of two CAM insertion irq 2010-12-31 13:46:20 -02:00
cimax2.h
cx23885-417.c [media] v4l: kill the BKL 2010-11-08 22:35:57 -02:00
cx23885-av.c
cx23885-av.h
cx23885-cards.c [media] support of GoTView PCI-E X5 3D Hybrid in cx23885 2010-12-29 08:17:18 -02:00
cx23885-core.c
cx23885-dvb.c
cx23885-f300.c
cx23885-f300.h
cx23885-i2c.c
cx23885-input.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
cx23885-input.h
cx23885-ioctl.c
cx23885-ioctl.h
cx23885-ir.c
cx23885-ir.h
cx23885-reg.h
cx23885-vbi.c
cx23885-video.c [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -02:00
cx23885.h [media] support of GoTView PCI-E X5 3D Hybrid in cx23885 2010-12-29 08:17:18 -02:00
cx23888-ir.c [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
cx23888-ir.h
Kconfig [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Makefile
netup-eeprom.c
netup-eeprom.h
netup-init.c
netup-init.h