upstream to linux 3.0.101

Change-Id: I2c7b1b521715dd2a78c6051c8af1be07c7f54efb