Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
[linux-2.6] / arch / i386 / kernel / setup.c
2005-06-01  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/gregkh/pci-2.6
2005-05-31  Alexander Nyberg[PATCH] acpi build fix: x86 setup.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2