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
..
k7.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Makefile	[PATCH] x86: Refactor thermal throttle processing	2006-09-26 10:52:42 +02:00
mce.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mce.h	[PATCH] mce section fix	2006-07-31 13:28:37 -07:00
non-fatal.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
p4.c	[PATCH] x86: Add a cumulative thermal throttle event counter.	2006-09-26 10:52:42 +02:00
p5.c	[PATCH] x86: add MCE resume	2005-11-07 07:53:30 -08:00
p6.c	[PATCH] x86: add MCE resume	2005-11-07 07:53:30 -08:00
therm_throt.c	[PATCH] severing module.h->sched.h	2006-12-04 02:00:22 -05:00
winchip.c	[PATCH] x86: add MCE resume	2005-11-07 07:53:30 -08:00