Diddy and Diageo Squash Beef, Settle 'Racist' Alcohol Lawsuit

Diddy and alcohol giant Diageo were ensnarled in a nasty legal battle last year -- but that's old news now ... 'cause TMZ can confirm both parties have buried the hatchet. Both Diddy and Diageo tell TMZ simultaneously ... "Sean Combs and Diageo…