linux/drivers/media
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08: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 Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
radio USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
rc Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
video Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08: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