1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-24 17:23:25 -05:00
linux/sound
Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-11-07 10:32:44 +01:00
..
aoa
arm
atmel
core
drivers
firewire Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
hda
i2c
isa
mips
oss
parisc
pci
pcmcia
ppc
sh
soc Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
sparc
spi
synth
usb Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
x86
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c