Re: [PATCH] libata: Misc minor merge fixups

2007-04-03 Thread Jeff Garzik
Alan Cox wrote: Nothing terribly exciting here just odd glitches from the merge ACK, will apply if I can sort out the confusion between -mm and local - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at

[PATCH] libata: Misc minor merge fixups

2007-03-23 Thread Alan Cox
Nothing terribly exciting here just odd glitches from the merge diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c linux-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c --- linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c 200