Vinod Koul e0d23ef29e Merge branch 'dma_slave_direction' into next_test_dirn ...

resolved conflicts:
	drivers/media/video/mx3_camera.c

2011-11-17 14:54:57 +05:30

..

common

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

dvb

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

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 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

video

Merge branch 'dma_slave_direction' into next_test_dirn

2011-11-17 14:54:57 +05:30

Kconfig

…

Makefile

…

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-entity.c

…