original_kernel/arch/i386
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
..
boot
crypto
kernel 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
lib [PATCH] separate bdi congestion functions from queue congestion functions 2006-10-20 10:26:35 -07:00
mach-default
mach-es7000
mach-generic
mach-visws [PATCH] visws build fix 2006-10-28 11:30:52 -07:00
mach-voyager
math-emu
mm
oprofile
pci PCI: make arch/i386/pci/common.c:pci_bf_sort static 2006-12-01 14:37:00 -08:00
power
Kconfig
Kconfig.cpu
Kconfig.debug
Makefile [PATCH] x86: Use -maccumulate-outgoing-args 2006-10-21 18:37:01 +02:00
Makefile.cpu
defconfig [PATCH] i386: Update defconfig 2006-10-21 18:37:01 +02:00