Please pull from the 'upstream-2.6.13' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git to receive the changes described in the attachment. No manual merges in this one, so it should be fine. I'll fix up netdev-2.6.git next.