alistair23-linux/drivers/media/dvb/mantis
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
..
hopper_cards.c [media] Mantis, hopper: use MODULE_DEVICE_TABLE 2010-12-29 08:16:48 -02:00
hopper_vp3028.c [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 2010-12-29 08:16:48 -02:00
hopper_vp3028.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
Kconfig [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Makefile V4L/DVB (13806): Register and Initialize Remote control 2010-01-17 11:55:44 -02:00
mantis_ca.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
mantis_ca.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_cards.c [media] Mantis, hopper: use MODULE_DEVICE_TABLE 2010-12-29 08:16:48 -02:00
mantis_common.h [media] ir-core: make struct rc_dev the primary interface 2010-12-29 08:16:37 -02:00
mantis_core.c [media] dvb: mantis: use '%pM' format to print MAC address 2010-10-21 07:55:57 -02:00
mantis_core.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_dma.c V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_dma.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_dvb.c [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 2010-12-29 08:16:48 -02:00
mantis_dvb.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_evm.c dvb: don't use flush_scheduled_work() 2010-12-24 16:00:17 +01:00
mantis_hif.c V4L/DVB: [Mantis] remove duplicated #include 2010-02-26 15:10:46 -03:00
mantis_hif.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_i2c.c [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 2010-10-21 07:54:26 -02:00
mantis_i2c.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_input.c [media] rc: use rc_map_ prefix for all rc map tables 2010-12-29 08:16:52 -02:00
mantis_ioc.c [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 2010-12-29 08:16:48 -02:00
mantis_ioc.h [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 2010-12-29 08:16:48 -02:00
mantis_link.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_pci.c V4L/DVB: [Mantis] remove duplicated #include 2010-02-26 15:10:46 -03:00
mantis_pci.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_pcmcia.c V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_reg.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_uart.c dvb: don't use flush_scheduled_work() 2010-12-24 16:00:17 +01:00
mantis_uart.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_vp1033.c [media] Mantis: use dvb_attach to avoid double dereferencing on module removal 2010-12-29 08:16:48 -02:00
mantis_vp1033.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_vp1034.c [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 2010-12-29 08:16:48 -02:00
mantis_vp1034.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_vp1041.c [media] Mantis: use dvb_attach to avoid double dereferencing on module removal 2010-12-29 08:16:48 -02:00
mantis_vp1041.h V4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID list 2010-01-17 11:55:42 -02:00
mantis_vp2033.c [media] Mantis: use dvb_attach to avoid double dereferencing on module removal 2010-12-29 08:16:48 -02:00
mantis_vp2033.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_vp2040.c [media] Mantis: use dvb_attach to avoid double dereferencing on module removal 2010-12-29 08:16:48 -02:00
mantis_vp2040.h V4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID list 2010-01-17 11:55:42 -02:00
mantis_vp3028.c V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_vp3028.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00
mantis_vp3030.c [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 2010-12-29 08:16:48 -02:00
mantis_vp3030.h V4L/DVB (13812): [Mantis/Hopper] Update Copyright header 2010-01-17 11:55:45 -02:00