Merge branch 'jb_2.5' of git://codeaurora.org/kernel/msm

Signed-off-by: task650 <task650@gmail.com>