Russell King 097d9eb537 Merge Linus' latest into master ... Conflicts: drivers/watchdog/at91rm9200_wdt.c drivers/watchdog/davinci_wdt.c drivers/watchdog/ep93xx_wdt.c drivers/watchdog/ixp2000_wdt.c drivers/watchdog/ixp4xx_wdt.c drivers/watchdog/ks8695_wdt.c drivers/watchdog/omap_wdt.c drivers/watchdog/pnx4008_wdt.c drivers/watchdog/sa1100_wdt.c drivers/watchdog/wdt285.c		2008-08-08 19:18:18 +01:00
..
aoa	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
arm	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
core	Revert "pcm_native.c: remove unused label"	2008-08-06 19:26:20 -07:00
drivers	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
i2c	V4L/DVB (8523): v4l2-dev: remove unused type and type2 field from video_device	2008-07-27 11:07:10 -03:00
isa	ALSA: cs4232: fix crash during chip PNP detection	2008-07-27 10:22:27 +02:00
mips	ALSA: ALSA driver for SGI O2 audio board	2008-07-14 09:01:02 +02:00
oss	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
parisc	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
pci	ALSA: Allow to force model to intel-mac-v3 in snd_hda_intel (sigmatel).	2008-07-27 10:22:27 +02:00
pcmcia	ALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver	2008-07-10 09:32:57 +02:00
ppc	ALSA: remove CONFIG_KMOD from sound	2008-07-10 09:32:58 +02:00
sh	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00
soc	Merge Linus' latest into master	2008-08-08 19:18:18 +01:00
sparc	ALSA: make sparc/dbri.c:snd_dbri_proc() static	2008-06-06 11:55:05 +02:00
spi	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
synth	[ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event	2008-05-13 14:47:43 +02:00
usb	ALSA: usb-audio: add some Yamaha USB MIDI quirks	2008-07-10 11:05:42 +02:00
Kconfig	sound: Convert to menuconfig	2008-05-27 15:56:20 +02:00
Makefile	…
ac97_bus.c	…
last.c	…
sound_core.c	device create: sound: convert device_create to device_create_drvdata	2008-07-21 21:54:44 -07:00
sound_firmware.c	…