From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 2 Nov 2011 01:25:04 +0000 (-0200)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20111103~45^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3db3e799ca5bc142af1f2746028b06b7c79e6734;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (560 commits)
  [media] staging: as102: Remove conditional compilation based on kernel version
  [media] staging: as102: Unconditionally compile code dependent on DVB_CORE
  [media] staging: as102: Add nBox Tuner Dongle support
  [media] staging: as102: Enable compilation
  [media] staging: as102: Convert the comments to kernel-doc style
  [media] staging: as102: Remove non-linux headers inclusion
  [media] staging: as102: Fix licensing oversight
  [media] staging: as102: Properly handle multiple product names
  [media] staging: as102: Add Elgato EyeTV DTT Deluxe
  [media] staging: as102: Fix CodingStyle errors in file as10x_cmd_cfg.c
  [media] staging: as102: Fix CodingStyle errors in file as102_usb_drv.c
  [media] staging: as102: Fix CodingStyle errors in file as102_fe.c
  [media] staging: as102: Fix CodingStyle errors in file as10x_cmd_stream.c
  [media] staging: as102: Fix CodingStyle errors in file as10x_cmd.c
  [media] staging: as102: Fix CodingStyle errors in file as102_fw.c
  [media] staging: as102: Fix CodingStyle errors in file as102_drv.c
  [media] staging: as102: Initial import from Abilis
  Linux 3.1
  x86: Fix S4 regression
  [media] mxl111sf: update demod_ops.info.name to "MaxLinear MxL111SF DVB-T demodulator"
  ...
---

3db3e799ca5bc142af1f2746028b06b7c79e6734