Revert "Merge branch 'jb_2.6' of git://codeaurora.org/quic/la/kernel/msm into fenderkernel-cm-mr2"

This reverts commit b910092b3f0306f9b3b021d9f0f64a18928be5ba, reversing
changes made to 8559d6ffb967b3c83e2bda0ca9ed47470fde3541.

Conflicts:

	arch/arm/configs/cyanogen_d2_defconfig