linux/sound/pci/ice1712
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
..
ak4xxx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
amp.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
amp.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
aureon.c Fix common misspellings 2011-03-31 11:26:23 -03:00
aureon.h [ALSA] Fix conflicts between const and __devinitdata 2007-05-11 16:55:49 +02:00
delta.c ALSA: ice1712 delta - initialize SPI clock 2011-01-18 15:25:16 +01:00
delta.h ALSA: ice1712 - working M-Audio Delta 66E support 2010-12-09 08:40:01 +01:00
envy24ht.h [ALSA] ice1724: fix MIDI 2008-05-20 14:22:44 +02:00
ews.c ALSA: Kill snd_assert() in sound/pci/* 2008-08-13 11:46:38 +02:00
ews.h [ALSA] ice1712 - Add Terrasoniq TS88 support 2008-04-24 12:00:40 +02:00
hoontech.c [ALSA] ice1712 - Fix hoontech MIDI input 2008-04-24 12:00:07 +02:00
hoontech.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
ice1712.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
ice1712.h Merge branch 'topic/hda' into for-linus 2009-12-04 16:22:45 +01:00
ice1724.c ALSA: use KBUILD_MODNAME for request_irq argument in sound/pci/* 2011-06-10 16:36:37 +02:00
juli.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
juli.h [ALSA] Fix conflicts between const and __devinitdata 2007-05-11 16:55:49 +02:00
Makefile ALSA: ice1724 - Infrasonic Quartet support 2009-09-21 15:49:04 +02:00
maya44.c ALSA: ice1724 - Fix ESI Maya44 capture source control 2010-05-12 16:43:32 +02:00
maya44.h ALSA: ice1724 - Add ESI Maya44 support 2009-05-06 17:33:19 +02:00
phase.c ALSA: ice1712/ice1724: Coding style fixes part 1 (more coming up) 2008-09-09 09:11:44 +02:00
phase.h ALSA: ice1712/ice1724: Coding style fixes part 1 (more coming up) 2008-09-09 09:11:44 +02:00
pontis.c Fix common misspellings 2011-03-31 11:26:23 -03:00
pontis.h [ALSA] Fix conflicts between const and __devinitdata 2007-05-11 16:55:49 +02:00
prodigy192.c sound: Remove unnecessary casts of private_data 2010-09-07 08:05:59 +02:00
prodigy192.h [ALSA] ice1724 - Functioning support for Prodigy 192 2007-05-11 16:55:58 +02:00
prodigy_hifi.c Fix common misspellings 2011-03-31 11:26:23 -03:00
prodigy_hifi.h [ALSA] ice1724 - Add missing prodigy_hifi.h 2008-01-31 17:30:03 +01:00
quartet.c ALSA: ice1724 - Infrasonic Quartet support 2009-09-21 15:49:04 +02:00
quartet.h ALSA: ice1724 - Infrasonic Quartet support 2009-09-21 15:49:04 +02:00
revo.c ALSA: ice1712/ice1724: Coding style fixes part 1 (more coming up) 2008-09-09 09:11:44 +02:00
revo.h [ALSA] Fix conflicts between const and __devinitdata 2007-05-11 16:55:49 +02:00
se.c [ALSA] ice1712, ice1724 - Code clean up 2008-01-31 17:30:05 +01:00
se.h [ALSA] ice1724 - Add support of Onkyo SE-90PCI and SE-200PCI 2008-01-31 17:29:09 +01:00
stac946x.h
vt1720_mobo.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
vt1720_mobo.h [ALSA] Fix conflicts between const and __devinitdata 2007-05-11 16:55:49 +02:00
wtm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wtm.h ALSA: ice1712/wtm: fix coding style 2008-09-09 09:11:39 +02:00