On Tue, 27 Jan 2009, Jeff Garzik wrote: > > Please pull from 'upstream-linus' branch of > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus > > to receive the following updates: > > drivers/ata/Kconfig | 6 ++-- > drivers/ata/libata-sff.c | 12 ++++++- > drivers/ata/pata_rb532_cf.c | 2 - > drivers/ata/pata_via.c | 22 +++++++++--- > drivers/ata/sata_mv.c | 56 ++++++++++++++---------------- > drivers/ata/sata_nv.c | 70 +++++++++++++++++++++++-------------- > include/linux/pci_ids.h | 4 ++ > 7 files changed, 104 insertions(+), 68 deletions(-) > delete mode 100644 arch/arm/mach-integrator/clock.h Hmm. That delete of the empty file is "correct" (and probably came as a result of somebody doing "make distclean" which deletes empty files), but should not have been committed as part of "libata-sff: fix incorrect EH message". Seems to be a mistake, and a small one, but still.. Be more careful. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html