mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +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> |
||
---|---|---|
.. | ||
ams | ||
adb-iop.c | ||
adb.c | ||
adbhid.c | ||
ans-lcd.c | ||
ans-lcd.h | ||
apm_emu.c | ||
Kconfig | ||
mac_hid.c | ||
macio-adb.c | ||
macio_asic.c | ||
macio_sysfs.c | ||
Makefile | ||
mediabay.c | ||
nvram.c | ||
rack-meter.c | ||
smu.c | ||
therm_adt746x.c | ||
therm_pm72.c | ||
therm_pm72.h | ||
therm_windtunnel.c | ||
via-cuda.c | ||
via-macii.c | ||
via-maciisi.c | ||
via-pmu-backlight.c | ||
via-pmu-event.c | ||
via-pmu-event.h | ||
via-pmu-led.c | ||
via-pmu.c | ||
via-pmu68k.c | ||
windfarm.h | ||
windfarm_core.c | ||
windfarm_cpufreq_clamp.c | ||
windfarm_lm75_sensor.c | ||
windfarm_max6690_sensor.c | ||
windfarm_pid.c | ||
windfarm_pid.h | ||
windfarm_pm81.c | ||
windfarm_pm91.c | ||
windfarm_pm112.c | ||
windfarm_pm121.c | ||
windfarm_smu_controls.c | ||
windfarm_smu_sat.c | ||
windfarm_smu_sensors.c |