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 staging: Fixes some checkpatch warnings in asus_oled/asus_oled.c 2012-07-09 12:32:53 -07:00
bcm staging: bcm: Misc.c: Remove unused macros 2012-07-11 17:04:42 -07:00
ccg
comedi Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
cptm1217 staging/cptm1217: fix checkpatch warnings 2012-07-19 16:11:26 -07:00
crystalhd
csr staging: csr: delete a bunch of unused library functions 2012-07-20 17:25:09 -07:00
cxt1e1
echo
et131x staging/et131x: fix checkpatch warnings 2012-07-19 16:01:30 -07:00
frontier staging/frontier: fix checkpatch warnings 2012-07-19 16:11:26 -07:00
ft1000 staging: ft1000-usb: Fix various checkpach warnings in ft1000_usb.h 2012-07-16 19:06:18 -07:00
gdm72xx Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
iio iio staging: fix cast warning and cleanup alignment code 2012-07-15 17:33:18 +01:00
ipack Staging: ipack: change naming convention in TODO file 2012-07-17 10:32:10 -07:00
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 staging: omap-thermal: add OMAP5 data structures 2012-07-16 19:04:16 -07:00
omapdrm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-07-26 14:18:18 -07:00
ozwpan
panel staging: panel: Use pr_info(...) rather than printk(KERN_INFO 2012-07-16 18:57:26 -07:00
phison staging/phison: use module_pci_driver macro 2012-07-11 17:26:02 -07:00
quickstart
ramster
rtl8187se
rtl8192e
rtl8192u
rtl8712
rts5139 staging: rts5139: rts51x_card: fixed brace coding style issue 2012-07-17 10:30:59 -07:00
rts_pstor staging/rts_pstor: use kthread_run instead doing kthread_create and wake_up_process 2012-07-16 19:24:46 -07:00
sbe-2t3e3 staging: sbe-2t3e3: Remove code that will never execute 2012-07-19 15:59:58 -07:00
sep staging: sep_crypto.c: remove duplicated include 2012-07-19 17:20:06 -07:00
serqt_usb2
slicoss staging/slicoss: disable pci device at remove 2012-07-11 17:26:02 -07:00
sm7xxfb staging: sm7xxfb: fix for "rename smtc_screen_info to smtc_scr_info" 2012-07-19 15:36:08 -07:00
speakup staging "speakup" Fix typos. 2012-07-09 13:06:21 -07:00
ste_rmi4 staging: ste_rmi4: Fix typos 2012-07-16 19:24:46 -07:00
telephony
tidspbridge
usbip
vme vme_user.c: remove duplicated include 2012-07-19 15:39:39 -07:00
vt6655 staging: vt6655: hostap.c: Remove all unused macros 2012-07-09 12:56:31 -07:00
vt6656 staging/vt6656: cleanup coding style in vResetCommandTimer 2012-07-16 19:13:49 -07:00
winbond staging/winbond: use err and remove nr 2012-07-16 19:21:37 -07:00
wlags49_h2 staging: wlags49_h2: remove vi modelines 2012-07-16 19:13:48 -07:00
wlags49_h25
wlan-ng staging/wlan-ng: use kzalloc rather using kmalloc at create_wlan 2012-07-16 19:21:37 -07:00
xgifb Staging: xgifb: Remove useless condition. 2012-07-11 16:59:32 -07:00
zcache staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
zram staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
zsmalloc staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
Kconfig staging: OMAP4+: thermal: introduce bandgap temperature sensor 2012-07-16 19:02:47 -07:00
Makefile staging: OMAP4+: thermal: introduce bandgap temperature sensor 2012-07-16 19:02:47 -07:00
staging.c