upstream to linux 3.0.64

Change-Id: I5cc9c2103759173cea7ef62f6bf7d0f8c764b90a