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

[POWERPC] Remove old includes from arch/ppc

2007-08-22 22:39:35 -05:00

adb.c

[POWERPC] Fix undefined reference to device_power_up/resume

2007-08-25 16:58:27 +10:00

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

[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need

2007-08-22 22:43:29 -05:00

ans-lcd.h

[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need

2007-08-22 22:43:29 -05:00

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

m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

2007-08-22 19:52:45 -07:00

macio_asic.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

macio_sysfs.c

…

macio-adb.c

…

Makefile

…

mediabay.c

…

nvram.c

…

rack-meter.c

[POWERPC] Clean up duplicate includes in drivers/macintosh/

2007-07-22 21:31:00 +10:00

smu.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

therm_adt746x.c

[POWERPC] drivers/macintosh/therm_adt746x.c: kmalloc + memset conversion to kzalloc

2007-08-17 11:01:51 +10:00

therm_pm72.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

therm_pm72.h

…

therm_windtunnel.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

via-cuda.c

…

via-macii.c

…

via-maciisi.c

…

via-pmu68k.c

remove dead code in via-pmu68k

2007-08-22 19:52:45 -07:00

via-pmu-backlight.c

…

via-pmu-event.c

…

via-pmu-event.h

…

via-pmu-led.c

…

via-pmu.c

Merge branch 'linux-2.6' into for-2.6.24

2007-08-28 15:56:11 +10:00

windfarm_core.c

usermodehelper: Tidy up waiting

2007-07-18 08:47:40 -07:00

windfarm_cpufreq_clamp.c

…

windfarm_lm75_sensor.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

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

[POWERPC] Comment out a currently unused function

2007-08-17 11:01:59 +10:00

windfarm_smu_sensors.c

…

windfarm.h

…