Dmitry Torokhov b981d8b3f5 Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	drivers/macintosh/adbhid.c

2007-10-12 21:27:47 -04:00

..

adb-iop.c

…

adb.c

…

adbhid.c

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2007-10-12 21:27:47 -04:00

ans-lcd.c

…

ans-lcd.h

…

apm_emu.c

…

Kconfig

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2007-10-12 21:27:47 -04:00

mac_hid.c

…

macio_asic.c

…

macio_sysfs.c

…

macio-adb.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-pmu68k.c

…

via-pmu-backlight.c

…

via-pmu-event.c

…

via-pmu-event.h

…

via-pmu-led.c

…

via-pmu.c

…

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_smu_controls.c

…

windfarm_smu_sat.c

…

windfarm_smu_sensors.c

…

windfarm.h

…