linux/drivers/video/matrox
Linus Torvalds 76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c
2011-03-24 09:50:13 -07:00
..
g450_pll.c matroxfb: fix problems with display stability 2009-12-16 07:20:05 -08:00
g450_pll.h matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
i2c-matroxfb.c i2c: Add support for custom probe function 2010-08-11 18:20:56 +02:00
Makefile
matroxfb_accel.c matroxfb: get rid of unneeded macro MINFO_FROM 2009-09-23 07:39:57 -07:00
matroxfb_accel.h matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
matroxfb_base.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
matroxfb_base.h matroxfb: fix incorrect use of memcpy_toio() 2010-08-20 09:34:54 -07:00
matroxfb_crtc2.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
matroxfb_crtc2.h
matroxfb_DAC1064.c drivers/video/matrox/matroxfb_DAC1064.c: remove undead ifdef CONFIG_FB_MATROX_G 2010-10-27 18:03:07 -07:00
matroxfb_DAC1064.h matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
matroxfb_g450.c matroxfb: get rid of unneeded macro MINFO_FROM 2009-09-23 07:39:57 -07:00
matroxfb_g450.h matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
matroxfb_maven.c drivers/video/matrox/matroxfb_maven.c: fix unsigned return type 2010-10-27 18:03:08 -07:00
matroxfb_maven.h
matroxfb_misc.c matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
matroxfb_misc.h matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
matroxfb_Ti3026.c matroxfb: get rid of unneeded macros WPMINFO and friends 2009-09-23 07:39:57 -07:00
matroxfb_Ti3026.h