Paul Mundt bbcf6e8b66 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: arch/sh/include/asm/Kbuild drivers/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2010-08-16 13:32:24 +09:00
..
aoa	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
arm
atmel
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-08-07 17:07:31 -07:00
drivers	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-08-07 17:07:31 -07:00
i2c
isa	ALSA: msnd: check request_region() return value	2010-07-29 13:48:39 +02:00
mips
oss	sound: oss: sh_dac_audio.c removed duplicated #include	2010-08-12 09:14:02 +02:00
parisc
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-08-15 11:22:00 -07:00
pcmcia	pcmcia: do not use io_req_t when calling pcmcia_request_io()	2010-08-03 09:04:11 +02:00
ppc
sh
soc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-08-16 13:32:24 +09:00
sparc	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
spi
synth
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-08-15 11:22:00 -07:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c