mirror of
https://github.com/fail0verflow/switch-linux.git
synced 2025-05-04 02:34:21 -04:00
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> |
||
---|---|---|
.. | ||
gameport | ||
joystick | ||
keyboard | ||
misc | ||
mouse | ||
serio | ||
tablet | ||
touchscreen | ||
apm-power.c | ||
evbug.c | ||
evdev.c | ||
ff-core.c | ||
ff-memless.c | ||
fixp-arith.h | ||
input-compat.c | ||
input-compat.h | ||
input-mt.c | ||
input-polldev.c | ||
input.c | ||
joydev.c | ||
Kconfig | ||
Makefile | ||
mousedev.c | ||
sparse-keymap.c |