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