Linux 3.0.69

Change-Id: I2e22ba1d15b6462bff12a2f01251cf3c54dc35a6
Linux 3.0.70

Change-Id: Ia700ce3a283ba34fb2a01cf4bf4749db30127c25
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1