2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
linux-next/sound/pci
Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...
2012-06-25 14:53:09 -07:00
..
ac97 ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
ali5451 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
asihpi ALSA: asihpi - Revert module_pci_driver conversion for asihpi.c 2012-04-26 07:19:39 +02:00
au88x0 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
aw2 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ca0106 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
cs46xx ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
cs5535audio ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ctxfi ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
echoaudio Merge branch 'topic/misc' into for-linus 2012-05-21 12:51:35 +02:00
emu10k1 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
hda ALSA: hda - Handle open while transitioning to D3. 2012-06-18 09:35:21 +02:00
ice1712 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
korg1212 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
lola ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
lx6464es ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
mixart ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
nm256 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
oxygen ALSA: oxygen: add Xonar DGX support 2012-05-05 14:24:12 +02:00
pcxhr ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
riptide ALSA: riptide: remove redundant NULL test before release_firmware() 2012-04-10 08:42:33 +02:00
rme9652 ALSA: hdspm - Work around broken DDS value on PCI RME MADI 2012-05-31 10:26:12 +02:00
trident ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
vx222 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ymfpci ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ad1889.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ad1889.h
ak4531_codec.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
als300.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
als4000.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
atiixp_modem.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
atiixp.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
azt3328.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
azt3328.h ALSA: azt3328: fix previous breakage, improve suspend, cleanups 2009-07-15 12:03:26 +02:00
bt87x.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
cmipci.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
cs4281.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
cs5530.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ens1370.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ens1371.c
es1938.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
es1968.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-06-25 14:53:09 -07:00
fm801.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-06-25 14:53:09 -07:00
intel8x0.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
intel8x0m.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
Kconfig Merge branch 'topic/misc' into for-linus 2012-05-21 12:51:35 +02:00
maestro3.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
Makefile ALSA: Add the driver for Digigram Lola PCI-e boards 2011-05-03 16:31:05 +02:00
rme32.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
rme96.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
sis7019.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
sis7019.h trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments. 2009-06-12 18:01:46 +02:00
sonicvibes.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
via82xx_modem.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
via82xx.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00