Aubrey Huff is staying put with the Giants, agreeing to a $22M, two-year deal with the World Series champions Tuesday, according to an Associated Press report. Huff receives $10M in each of the next two seasons under the deal, and the Giants have a $10M club option for 2013 with a $2M buyout.