-
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6由 David Howells 提交于
Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: NDavid Howells <dhowells@redhat.com>9db73724