Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2...
[linux-2.6] / arch / i386 / Kconfig
2005-05-04  Linus TorvaldsMerge ... /linux/kernel/git/shaggy/jfs-2.6.git/
2005-05-04  Al Viro[PATCH] ISA DMA Kconfig fixes - part 1
2005-05-01  Jaya Kumar[PATCH] x86 reboot: Add reboot fixup for gx1/cs5530a
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2