openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/sound/pci
History
Linus Torvalds 664a41b8a9 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)
 		2011-07-30 00:08:53 -07:00
..
ac97 ALSA: azt3328: hook up new emulated AC97 on AC97 patch side 2011-02-19 16:03:08 +01:00
ali5451 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
asihpi ALSA: asihpi - off by one in asihpi_hpi_ioctl() 2011-07-27 16:06:16 +02:00
au88x0 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
aw2 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
ca0106 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
cs46xx ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
cs5535audio Merge branch 'topic/misc' into for-linus 2011-07-22 08:43:24 +02:00
ctxfi ALSA: ctxfi: Change PLL initialization code 2011-06-16 07:28:57 +02:00
echoaudio atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
emu10k1 Merge branch 'test/pci-rename' into topic/misc 2011-06-14 08:56:42 +02:00
hda ALSA: hda - Fix duplicated DAC assignments for Realtek 2011-07-27 16:44:40 +02:00
ice1712 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
korg1212 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
lola ALSA: lola - Fix for Lola280 board 2011-06-24 12:54:43 +02:00
lx6464es atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mixart ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
nm256 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
oxygen ALSA: virtuoso: fix silent analog output on Xonar Essence ST Deluxe 2011-07-18 09:39:50 +02:00
pcxhr ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
riptide ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
rme9652 Merge branch 'topic/misc' into for-linus 2011-07-22 08:43:24 +02:00
trident ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
vx222 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
ymfpci ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
Kconfig [media] radio-sf16fmr2: convert to generic TEA575x interface 2011-07-27 17:52:23 -03:00
Makefile ALSA: Add the driver for Digigram Lola PCI-e boards 2011-05-03 16:31:05 +02:00
ad1889.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
ad1889.h
…
ak4531_codec.c ALSA: Fix missing KERN_* prefix to printk in sound/pci 2009-02-05 16:11:31 +01:00
als300.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
als4000.c ALSA: Use KBUILD_MODNAME for pci_driver.name entries 2011-06-10 16:20:20 +02:00
atiixp.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
atiixp_modem.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
azt3328.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
azt3328.h ALSA: azt3328: fix previous breakage, improve suspend, cleanups 2009-07-15 12:03:26 +02:00
bt87x.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
cmipci.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
cs4281.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
cs5530.c ALSA: Use KBUILD_MODNAME for pci_driver.name entries 2011-06-10 16:20:20 +02:00
ens1370.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
ens1371.c
…
es1938.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
es1968.c ALSA: es1968,maestro3 - Use work for hw-volume control 2011-06-14 13:59:51 +02:00
fm801.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
intel8x0.c ALSA: intel8x0: Apply headphones+mute LED quirk for Dell Inspiron 9300 2011-07-15 07:54:26 +02:00
intel8x0m.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
maestro3.c ALSA: es1968,maestro3 - Use work for hw-volume control 2011-06-14 13:59:51 +02:00
rme32.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
rme96.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
sis7019.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +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: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
via82xx.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
via82xx_modem.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00