update to Linus tree - Feb 20, 2012