From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 8 Nov 2011 18:53:46 +0000 (-0200)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20111109~39^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=528bb5c3fbcd1cd245437ff5c51cd7c8a73c3a0e;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (62 commits)
  [media] V4L menu: add submenu for platform devices
  [media] cx88: fix menu level for the VP-3054 module
  [media] V4L menu: move all PCI(e) devices to their own submenu
  [media] V4L menu: reorganize the radio menu
  [media] V4L menu: remove duplicate USB dependency
  [media] V4L menu: move all platform drivers to the bottom of the menu
  [media] V4L menu: remove the EXPERIMENTAL tag from vino and c-qcam
  [media] V4L menu: move ISA and parport drivers into their own submenu
  [media] V4L menu: move USB drivers section to the top
  [media] usbvision: Drop broken 10-bit I2C address support
  [media] Support for Sveon STV22 (IT9137)
  [media] staging: as102: Eliminate as10x_handle_t alias
  [media] staging: as102: Define device name string pointers constant
  [media] staging: as102: Move variable declarations to the header
  [media] staging: as102: Use linux/uaccess.h instead of asm/uaccess.h
  [media] staging: as102: Remove linkage specifiers for C++
  [media] staging: as102: Replace printk(KERN_<LEVEL> witk pr_<level>
  [media] staging: as102: Whitespace and indentation cleanup
  [media] staging: as102: Fix the dvb device registration error path
  [media] staging: as102: Replace pragma(pack) with attribute __packed
  ...

Conflicts:
	drivers/media/radio/Kconfig
---

528bb5c3fbcd1cd245437ff5c51cd7c8a73c3a0e