Squashed update of kernel from 3.0.63 to 3.0.64
Merge remote-tracking branch 'upstream/ics-3.0' into ics-3.0
Readjustments