kernel-fxtec-pro1x/drivers/media/video/em28xx
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
..
em28xx-audio.c [media] em28xx-audio: fix some locking issues 2010-10-21 01:17:50 -02:00
em28xx-cards.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
em28xx-core.c V4L/DVB: em28xx: remove unneeded null checks 2010-06-01 01:23:23 -03:00
em28xx-dvb.c [media] em28xx: Add support for Leadership ISDB-T 2010-12-29 08:16:26 -02:00
em28xx-i2c.c V4L/DVB (12343): Stop defining I2C adapter IDs nobody uses 2009-09-12 12:18:13 -03:00
em28xx-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
em28xx-reg.h V4L/DVB (13915): em28xx: fix a typo on RC6 modes 2010-02-26 15:10:30 -03:00
em28xx-vbi.c [media] media: fix em28xx build, needs hardirq.h 2010-12-29 08:17:02 -02:00
em28xx-video.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-01-06 18:32:12 -08:00
em28xx.h [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Kconfig [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Makefile V4L/DVB (12742): em28xx: add raw VBI support for NTSC 2009-09-18 23:47:41 -03:00