Arnd Bergmann 928a11ba36 Merge branch 'next/cleanup' into samsung/dt ... Conflicts: arch/arm/mach-exynos/common.c The common.c file gets changes from rmk/stable-devel (part of next/cleanup), rmk/restart, samsung/dt and follow-on branches from the samsung tree. Pulling it all together here hopefully avoids having to do even more conflicting merge changesets in this one file. What a mess! Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:23:00 +00: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 branch 'next/cleanup' into samsung/dt	2012-01-07 20:23:00 +00:00
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