mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 12:52:30 +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> |
||
---|---|---|
.. | ||
backlight.c | ||
bootx_init.c | ||
cache.S | ||
cpufreq_32.c | ||
cpufreq_64.c | ||
feature.c | ||
Kconfig | ||
low_i2c.c | ||
Makefile | ||
nvram.c | ||
pci.c | ||
pfunc_base.c | ||
pfunc_core.c | ||
pic.c | ||
pmac.h | ||
setup.c | ||
sleep.S | ||
smp.c | ||
time.c | ||
udbg_adb.c | ||
udbg_scc.c |