Joerg Roedel 00fb5430f5 Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next ...

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c

2012-01-09 13:04:05 +01:00

..

common

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2011-12-20 10:49:39 -08:00

dvb

Revert "[media] af9015: limit I2C access to keep FW happy"

2011-12-12 16:02:15 -02:00

radio

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

rc

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2011-12-20 10:49:39 -08:00

video

Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next

2012-01-09 13:04:05 +01:00

Kconfig

[media] DVB: dvb-net, make the kconfig text helpful

2011-07-27 17:53:09 -03:00

Makefile

[media] media: Entities, pads and links

2011-03-22 04:53:10 -03:00

media-device.c

drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required

2011-10-31 19:31:51 -04:00

media-devnode.c

[media] media: Fix media device minor registration

2011-06-01 13:24:23 -03:00

media-entity.c

[media] media: Properly handle link flags in link setup, link notify callback

2011-04-17 07:43:32 -03:00