David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>

2006-12-05 17:01:28 +00:00

..

adb-iop.c

[PATCH] m68k pt_regs fixes

2006-10-07 10:51:14 -07:00

adb.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

adbhid.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

ans-lcd.c

[PATCH] powerpc: Remove sections use from ppc64 and drivers

2005-09-19 09:38:49 +10:00

apm_emu.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

Kconfig

[POWERPC] Xserve cpu-meter driver

2006-12-04 20:39:30 +11:00

mac_hid.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

macio_asic.c

Merge branch 'merge'

2006-08-01 10:37:25 +10:00

macio_sysfs.c

[POWERPC] powermac: Constify & voidify get_property()

2006-07-31 15:55:05 +10:00

macio-adb.c

[PATCH] misc ppc pt_regs fixes

2006-10-08 12:32:36 -07:00

Makefile

[POWERPC] Xserve cpu-meter driver

2006-12-04 20:39:30 +11:00

mediabay.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

nvram.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rack-meter.c

[POWERPC] Xserve cpu-meter driver

2006-12-04 20:39:30 +11:00

smu.c

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

2006-12-05 17:01:28 +00:00

therm_adt746x.c

[POWERPC] Souped-up of_platform_device support

2006-12-04 16:08:52 +11:00

therm_pm72.c

[POWERPC] Souped-up of_platform_device support

2006-12-04 16:08:52 +11:00

therm_pm72.h

[POWERPC] Xserve G5 thermal control fixes

2006-07-28 10:42:49 +10:00

therm_windtunnel.c

[POWERPC] Souped-up of_platform_device support

2006-12-04 16:08:52 +11:00

via-cuda.c

[PATCH] powerpc: irq change build breaks

2006-10-05 18:39:04 -07:00

via-macii.c

[PATCH] m68k pt_regs fixes

2006-10-07 10:51:14 -07:00

via-maciisi.c

[PATCH] m68k pt_regs fixes

2006-10-07 10:51:14 -07:00

via-pmu68k.c

[PATCH] m68k pt_regs fixes

2006-10-07 10:51:14 -07:00

via-pmu-backlight.c

[PATCH] Fix uninitialised spinlock in via-pmu-backlight code.

2006-09-29 09:18:03 -07:00

via-pmu-event.c

Input: via-pmu - add input device support

2006-06-26 01:49:55 -04:00

via-pmu-event.h

Input: via-pmu - add input device support

2006-06-26 01:49:55 -04:00

via-pmu-led.c

[POWERPC] powermac: Constify & voidify get_property()

2006-07-31 15:55:05 +10:00

via-pmu.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

windfarm_core.c

[PATCH] Notifier chain update: API changes

2006-03-27 08:44:50 -08:00

windfarm_cpufreq_clamp.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

windfarm_lm75_sensor.c

[PATCH] macintosh: cleanup the use of i2c headers

2006-03-23 14:40:24 +11:00

windfarm_max6690_sensor.c

[PATCH] macintosh: cleanup the use of i2c headers

2006-03-23 14:40:24 +11:00

windfarm_pid.c

[PATCH] windfarm license fix

2006-03-06 18:40:45 -08:00

windfarm_pid.h

[PATCH] powerpc: Thermal control for dual core G5s

2006-02-07 22:05:14 -08:00

windfarm_pm81.c

[PATCH] powerpc: windfarm shall request it's sub modules

2006-11-15 19:57:12 -08:00

windfarm_pm91.c

[PATCH] powerpc: windfarm shall request it's sub modules

2006-11-15 19:57:12 -08:00

windfarm_pm112.c

[PATCH] powerpc: windfarm shall request it's sub modules

2006-11-15 19:57:12 -08:00

windfarm_smu_controls.c

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

windfarm_smu_sat.c

[PATCH] windfarm_smu_sat.c: simplify around i2c_add_driver()

2006-09-29 09:18:19 -07:00

windfarm_smu_sensors.c

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

windfarm.h

[PATCH] powerpc: Thermal control for dual core G5s

2006-02-07 22:05:14 -08:00