leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
229664bee6
linux/sound
History
Linus Torvalds e9b62693ae Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
  DOC:  A couple corrections and clarifications in USB doc.
  Generate a slightly more informative error msg for bad HZ
  fix typo "is" -> "if" in Makefile
  ext*: spelling fix prefered -> preferred
  DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
  KEYS:  Fix the comment to match the file name in rxrpc-type.h.
  RAID: remove trailing space from printk line
  DMA engine: typo fixes
  Remove unused MAX_NODES_SHIFT
  MAINTAINERS: Clarify access to OCFS2 development mailing list.
  V4L: Storage class should be before const qualifier (sn9c102)
  V4L: Storage class should be before const qualifier
  sonypi: Storage class should be before const qualifier
  intel_menlow: Storage class should be before const qualifier
  DVB: Storage class should be before const qualifier
  arm: Storage class should be before const qualifier
  ALSA: Storage class should be before const qualifier
  acpi: Storage class should be before const qualifier
  firmware_sample_driver.c: fix coding style
  MAINTAINERS: Add ati_remote2 driver
  ...

Fixed up trivial conflicts in firmware_sample_driver.c
2008-04-21 16:36:46 -07:00
..
aoa [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
arm [ARM] pxa: separate GPIOs and their mode definitions to pxa2xx-gpio.h 2008-04-19 11:29:04 +01:00
core Dont touch fs_struct in drivers 2008-02-14 21:13:32 -08:00
drivers [ALSA] opl3 - Fix compilation without sequencer support 2008-02-22 14:20:08 -08:00
i2c [ALSA] fm801 - Add mute support for FM-only card with FM801 PCI to tuner bridge 2008-01-31 17:30:14 +01:00
isa [ALSA] sb8: fix SB 1.0 capture DMA programming 2008-02-29 11:28:15 +01:00
mips [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
oss sound/oss/ac97_codec.c: restore MODULE_LICENSE 2008-03-30 14:46:11 -07:00
parisc [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
pci ALSA: Storage class should be before const qualifier 2008-04-21 22:25:51 +00:00
pcmcia [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
ppc ALSA: Storage class should be before const qualifier 2008-04-21 22:25:51 +00:00
sh [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
soc Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel 2008-04-19 17:17:25 +01:00
sparc [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
spi [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
synth [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
usb USB: usbaudio: handle kcalloc failure 2008-03-10 16:42:25 -07:00
ac97_bus.c
Kconfig [ALSA] Add SPI devices to ALSA Kconfig and Makefile 2007-10-16 15:57:47 +02:00
last.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
Makefile [ALSA] Add SPI devices to ALSA Kconfig and Makefile 2007-10-16 15:57:47 +02:00
sound_core.c
sound_firmware.c Detach sched.h from mm.h 2007-05-21 09:18:19 -07:00