alistair23-linux/drivers/media/pci/mantis
Mauro Carvalho Chehab a32f7d1ad3 Merge branch 'v4l_for_linus' into staging/for_v3.9
* v4l_for_linus: (464 commits)
  [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures
  [media] uvcvideo: Cleanup leftovers of partial revert
  [media] uvcvideo: Return -EACCES when trying to set a read-only control
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  ...

Conflicts:
	drivers/media/pci/dm1105/dm1105.c
	drivers/media/platform/soc_camera/mx2_camera.c
2013-01-24 18:49:18 -02:00
..
hopper_cards.c Drivers: media: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
hopper_vp3028.c
hopper_vp3028.h
Kconfig
Makefile
mantis_ca.c [media] mantis: cleanup NULL checking in mantis_ca_exit() 2012-12-27 20:25:38 -02:00
mantis_ca.h
mantis_cards.c Drivers: media: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
mantis_common.h
mantis_core.c
mantis_core.h
mantis_dma.c
mantis_dma.h
mantis_dvb.c Drivers: media: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
mantis_dvb.h
mantis_evm.c
mantis_hif.c
mantis_hif.h
mantis_i2c.c Drivers: media: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
mantis_i2c.h
mantis_input.c
mantis_ioc.c
mantis_ioc.h
mantis_link.h
mantis_pci.c Drivers: media: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
mantis_pci.h
mantis_pcmcia.c
mantis_reg.h
mantis_uart.c
mantis_uart.h
mantis_vp1033.c
mantis_vp1033.h
mantis_vp1034.c
mantis_vp1034.h
mantis_vp1041.c
mantis_vp1041.h
mantis_vp2033.c
mantis_vp2033.h
mantis_vp2040.c
mantis_vp2040.h
mantis_vp3028.c
mantis_vp3028.h
mantis_vp3030.c
mantis_vp3030.h