Squashed update of kernel from 3.0.57 to 3.0.58
Merge remote-tracking branch 'arco/ics-3.0' into ics-3.0