Squashed update of kernel from 3.0.58 to 3.0.59
Squashed update of kernel from 3.0.59 to 3.0.60
Merge remote-tracking branch 'upstream/ics-3.0' into ics-3.0