UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/sound/pci
History
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
 		2011-07-25 13:56:39 -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 Merge branch 'topic/misc' into for-linus 2011-07-22 08:43:24 +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 ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
emu10k1 Merge branch 'test/pci-rename' into topic/misc 2011-06-14 08:56:42 +02:00
hda Merge branch 'topic/hda' into for-linus 2011-07-22 08:43:27 +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 ALSA: lx6464es - include mac address in device name 2011-06-25 09:15:31 +02: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 Merge branch 'topic/misc' into for-linus 2011-05-22 10:01:29 +02: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 [ALSA] ad1889: add AD1889 driver 2005-09-12 10:40:17 +02:00
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