android_kernel_google_msm/drivers/macintosh
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2
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>
2012-01-06 11:42:52 -08:00
..
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 drivers: fix up various ->llseek() implementations 2011-07-20 20:47:58 -04:00
rack-meter.c
smu.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
therm_adt746x.c
therm_pm72.c treewide: fix a few typos in comments 2011-05-10 10:16:21 +02:00
therm_pm72.h
therm_windtunnel.c
via-cuda.c
via-macii.c m68k/irq: Remove obsolete IRQ_FLG_* users 2011-11-08 22:35:48 +01:00
via-maciisi.c m68k/irq: Remove obsolete IRQ_FLG_* users 2011-11-08 22:35:48 +01:00
via-pmu-backlight.c
via-pmu-event.c
via-pmu-event.h
via-pmu-led.c
via-pmu.c powerpc/pmac: Update via-pmu to new syscore_ops 2011-05-20 15:37:22 +10:00
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