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