Squashed update of BFQ-v6r1 to BFQ-v6r2
Merge branch 'cm-10.1' of git://github.com/arco/samsung-kernel-msm7x30 into cm-10.1