Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[deliverable/linux.git] / include / linux / libata.h
2005-06-06  Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-06-04  Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-06-03  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6
2005-06-03  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/davem/net-2.6
2005-06-02  Linus TorvaldsMerge of 'docs' branch from