mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-24 18:38:38 +00:00
ff4b8a57f0
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
---|---|---|
.. | ||
6fire | ||
caiaq | ||
misc | ||
usx2y | ||
card.c | ||
card.h | ||
clock.c | ||
clock.h | ||
debug.h | ||
endpoint.c | ||
endpoint.h | ||
format.c | ||
format.h | ||
helper.c | ||
helper.h | ||
Kconfig | ||
Makefile | ||
midi.c | ||
midi.h | ||
mixer_maps.c | ||
mixer_quirks.c | ||
mixer_quirks.h | ||
mixer.c | ||
mixer.h | ||
pcm.c | ||
pcm.h | ||
power.h | ||
proc.c | ||
proc.h | ||
quirks-table.h | ||
quirks.c | ||
quirks.h | ||
stream.c | ||
stream.h | ||
usbaudio.h |