linux/drivers/staging
Linus Torvalds 8762541f06 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull second set of media updates from Mauro Carvalho Chehab:

 - radio API: add support to work with radio frequency bands

 - new AM/FM radio drivers: radio-shark, radio-shark2

 - new Remote Controller USB driver: iguanair

 - conversion of several drivers to the v4l2 core control framework

 - new board additions at existing drivers

 - the remaining (and vast majority of the patches) are due to
   drivers/DocBook fixes/cleanups.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (154 commits)
  [media] radio-tea5777: use library for 64bits div
  [media] tlg2300: Declare MODULE_FIRMWARE usage
  [media] lgs8gxx: Declare MODULE_FIRMWARE usage
  [media] xc5000: Add MODULE_FIRMWARE statements
  [media] s2255drv: Add MODULE_FIRMWARE statement
  [media] dib8000: move dereference after check for NULL
  [media] Documentation: Update cardlists
  [media] bttv: add support for Aposonic W-DVR
  [media] cx25821: Remove bad strcpy to read-only char*
  [media] pms.c: remove duplicated include
  [media] smiapp-core.c: remove duplicated include
  [media] via-camera: pass correct format settings to sensor
  [media] rtl2832.c: minor cleanup
  [media] Add support for the IguanaWorks USB IR Transceiver
  [media] Minor cleanups for MCE USB
  [media] drivers/media/dvb/siano/smscoreapi.c: use list_for_each_entry
  [media] Use a named union in struct v4l2_ioctl_info
  [media] mceusb: Add Twisted Melon USB IDs
  [media] staging/media/solo6x10: use module_pci_driver macro
  [media] staging/media/dt3155v4l: use module_pci_driver macro
  ...

Conflicts:
	Documentation/feature-removal-schedule.txt
2012-07-31 18:47:44 -07:00
..
android
asus_oled
bcm
ccg
comedi Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
cptm1217
crystalhd
csr staging: csr: delete a bunch of unused library functions 2012-07-20 17:25:09 -07:00
cxt1e1
echo
et131x
frontier
ft1000
gdm72xx Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
iio
ipack
keucr
line6
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-07-31 18:47:44 -07:00
net
nvec Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
octeon staging: octeon_ethernet: Convert to use device tree. 2012-07-23 13:54:53 +01:00
olpc_dcon
omap-thermal
omapdrm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-07-26 14:18:18 -07:00
ozwpan
panel
phison
quickstart
ramster
rtl8187se
rtl8192e
rtl8192u
rtl8712
rts5139
rts_pstor
sbe-2t3e3
sep staging: sep_crypto.c: remove duplicated include 2012-07-19 17:20:06 -07:00
serqt_usb2
slicoss
sm7xxfb
speakup
ste_rmi4
telephony
tidspbridge
usbip
vme
vt6655
vt6656
winbond
wlags49_h2
wlags49_h25
wlan-ng
xgifb
zcache
zram
zsmalloc
Kconfig
Makefile
staging.c