From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 13 Jul 2011 23:58:59 +0000 (-0300)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20110726~49^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=632c56fb2efb3cc586e8948c1dab986cb763ed41;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (178 commits)
  [media] redrat3: improve compat with lirc userspace decode
  [media] redrat3: cap duration in the right place
  [media] redrat3: sending extra trailing space was useless
  [media] rc-core support for Microsoft IR keyboard/mouse
  [media] af9015: add support for Sveon STV22 [1b80:e401]
  [media] af9015: remove 2nd I2C-adapter
  [media] af9015: remove old FW based IR polling code
  [media] af9015: add more I2C msg checks
  [media] af9015: small optimization
  [media] af9015: map remote for MSI DIGIVOX Duo
  [media] af9015: setup rc keytable for LC-Power LC-USB-DVBT
  [media] media, Micronas dvb-t: Fix mem leaks, don't needlessly zero mem, fix spelling
  [media] rc-rc6-mce: minor keymap updates
  [media] drivers/media/video/cx231xx/cx231xx-cards.c: add missing kfree
  [media] drivers/media/video: add missing kfree
  [media] TM6000: alsa: Clean up kernel coding style errors
  [media] tm6000: remove a check for NO_PCM_LOCK
  [media] DVB: dvb_frontend: off by one in dtv_property_dump()
  [media] cx23885: added support for card 107d:6f39
  [media] drivers/media: static should be at beginning of declaration
  ...

Conflicts:
	Documentation/feature-removal-schedule.txt
---

632c56fb2efb3cc586e8948c1dab986cb763ed41