Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ...

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

2008-10-15 11:31:54 +11:00

..

aoa

Merge commit 'origin'

2008-10-15 11:31:54 +11:00

arm

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

core

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-11 12:39:35 -07:00

drivers

ALSA: mtpav - Fix race in probe

2008-10-10 13:41:58 +02:00

i2c

V4L/DVB (8788): v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)

2008-10-12 09:36:54 -02:00

isa

ALSA: remove stale files

2008-09-09 09:10:52 +02:00

mips

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

oss

ALSA: ASoC: update email address for Liam Girdwood

2008-10-13 02:26:42 +02:00

parisc

ALSA: harmony - fix a typo

2008-09-04 10:33:55 +02:00

pci

Merge branches 'topic/asoc' and 'topic/hda' into for-linus

2008-10-13 03:42:18 +02:00

pcmcia

ALSA: Kill snd_assert() in other places

2008-08-13 11:46:40 +02:00

ppc

ALSA: Kill snd_assert() in other places

2008-08-13 11:46:40 +02:00

sh

ALSA: Fix section for snd-aica platform driver

2008-09-23 08:17:58 +02:00

soc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2008-10-13 10:06:58 -07:00

sparc

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-11 12:39:35 -07:00

spi

sound: Convert to menuconfig

2008-05-27 15:56:20 +02:00

synth

ALSA: Kill snd_assert() in other places

2008-08-13 11:46:40 +02:00

usb

ALSA: usb-audio: dynamic detection of MIDI interfaces in uaxx-quirk

2008-10-10 13:41:57 +02:00

ac97_bus.c

[ALSA] ac97_bus power management

2007-02-09 09:03:54 +01:00

Kconfig

Fix CONFIG_AC97_BUS dependency

2008-09-06 11:43:41 +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

ALSA: fix section mismatch in the sound_core

2008-09-09 09:11:53 +02:00

sound_firmware.c

Detach sched.h from mm.h

2007-05-21 09:18:19 -07:00