Clover patch upsteamed & r300 patch updated