Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ... Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 11:51:28 +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 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00: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