linux/drivers/media/dvb
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
b2c2 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
bt8xx [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
ddbridge staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
dm1105 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
dvb-core Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-10-31 15:42:54 -07:00
dvb-usb [media] it913x [VER 1.07] Support for single ITE 9135 devices 2011-11-03 18:33:58 -02:00
firewire [media] firedtv: change some -EFAULT returns to more fitting error codes 2011-07-27 17:53:38 -03:00
frontends Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
mantis [media] Refactor Mantis DMA transfer to deliver 16Kb TS data per interrupt 2011-09-25 08:43:06 -03:00
ngene staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
pluto2 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
pt1 [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
siano Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
ttpci [media] stb0899: Removed an extra byte sent at init on DiSEqC bus 2011-09-25 08:41:23 -03:00
ttusb-budget [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
ttusb-dec [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
Kconfig [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00
Makefile [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00