android_kernel_xiaomi_sm8350/drivers/media/video/cx18
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
..
cx18-alsa-main.c
cx18-alsa-mixer.c
cx18-alsa-mixer.h
cx18-alsa-pcm.c [media] cx18: convert to unlocked_ioctl 2010-12-01 20:10:16 -02:00
cx18-alsa-pcm.h
cx18-alsa.h
cx18-audio.c
cx18-audio.h
cx18-av-audio.c
cx18-av-core.c
cx18-av-core.h
cx18-av-firmware.c
cx18-av-vbi.c
cx18-cards.c [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -02:00
cx18-cards.h
cx18-controls.c [media] v4l2-ctrls: use const char * const * for the menu arrays 2010-12-30 08:02:14 -02:00
cx18-controls.h
cx18-driver.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
cx18-driver.h [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-dvb.c [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-dvb.h
cx18-fileops.c
cx18-fileops.h
cx18-firmware.c
cx18-firmware.h
cx18-gpio.c
cx18-gpio.h
cx18-i2c.c [media] rc: Rename remote controller type to rc_type instead of ir_type 2010-12-29 08:16:50 -02:00
cx18-i2c.h
cx18-io.c
cx18-io.h
cx18-ioctl.c
cx18-ioctl.h
cx18-irq.c
cx18-irq.h
cx18-mailbox.c [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-mailbox.h
cx18-queue.c
cx18-queue.h
cx18-scb.c
cx18-scb.h
cx18-streams.c [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-streams.h [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-vbi.c
cx18-vbi.h
cx18-version.h
cx18-video.c
cx18-video.h
cx23418.h
Kconfig [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Makefile