merge Linus head tree into my drm tree and fix up conflicts
[linux-2.6] / arch / i386 / kernel / reboot_fixups.c
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-17  Tony LuckMerge ... temp tree to get David's gdb inferior calls...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-01  Jaya Kumar[PATCH] x86 reboot: Add reboot fixup for gx1/cs5530a