linux/drivers/staging/lirc
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
..
Kconfig [media] lirc: remove staging lirc_it87 and lirc_ite8709 drivers 2011-03-22 17:20:13 -03:00
Makefile [media] lirc: remove staging lirc_it87 and lirc_ite8709 drivers 2011-03-22 17:20:13 -03:00
TODO V4L/DVB: staging/lirc: wire up Kconfig and Makefile bits 2010-08-02 16:43:34 -03:00
TODO.lirc_zilog [media] lirc_zilog: Update TODO list based on work completed and revised plans 2011-03-22 19:24:01 -03:00
lirc_bt829.c V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
lirc_ene0100.h V4L/DVB: staging/lirc: add lirc_ene0100 driver 2010-08-02 16:43:21 -03:00
lirc_igorplugusb.c [media] lirc_igorplugusb: add Fit PC2 device ID 2010-10-22 20:05:37 -02:00
lirc_imon.c [media] lirc: silence some compile warnings 2011-03-22 19:24:20 -03:00
lirc_parallel.c staging: lirc: fix for "lirc_dev: lirc_register_driver: driver pointer must be not NULL!" 2011-03-07 13:23:26 -08:00
lirc_parallel.h V4L/DVB: staging/lirc: add lirc_parallel driver 2010-08-02 16:43:27 -03:00
lirc_sasem.c [media] lirc: silence some compile warnings 2011-03-22 19:24:20 -03:00
lirc_serial.c [media] staging/lirc: fix mem leaks and ptr err usage 2011-01-19 12:52:22 -02:00
lirc_sir.c [media] staging/lirc: fix mem leaks and ptr err usage 2011-01-19 12:52:22 -02:00
lirc_ttusbir.c V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
lirc_zilog.c [media] lirc_zilog: error out if buffer read bytes != chunk size 2011-03-22 19:24:21 -03:00