upstream to linux 3.0.60

Change-Id: I4e9d3fa125480a525d6052d91d9b34329990bb93