linux/drivers/media
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
common [media] xc5000: Add MODULE_FIRMWARE statements 2012-07-30 23:31:42 -03:00
dvb USB: smsusb: remove __devinit* from the struct usb_device_id table 2012-08-17 17:50:44 -07:00
radio [media] radio-shark2: Only compile led support when CONFIG_LED_CLASS is set 2012-08-12 13:50:09 -03:00
rc [media] Add USB dependency for IguanaWorks USB IR Transceiver 2012-08-12 07:35:00 -03:00
video Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
Kconfig [media] Kconfig: Split the core support options from the driver ones 2012-07-06 09:12:59 -03:00
Makefile
media-device.c [media] media: fix truncated entity specification 2011-12-20 09:31:50 -02:00
media-devnode.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
media-entity.c [media] media: Add link_validate() op to check links to the sink pad 2012-05-14 08:44:11 -03:00