upstream to linux 3.0.40

Change-Id: I9d9f3ebf562b2ab4e7565e43f33d5037f54cddec
upstream to linu 3.0.50

Change-Id: Ibbe43a834ac3ecf0b4bf6c93b5efd48164fbf635