Learn more about cloning repositories
You have read-only access
Merge branch 'master' Conflicts: drivers/scsi/libata-scsi.c include/linux/libata.h
