Merge branch 'jb_2.5' of git://codeaurora.org/platform/external/v8 into jb-mv-rebase
Merge branch 'linaro_android_4.2.2' of git://android.git.linaro.org/platform/external/v8 into jb-mv-rebase

Conflicts:
	src/platform-linux.cc

Change-Id: I5f745086e89c92d1d39a24b2dfa0a2ae5dc6a8f1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_external_v8 into jb-mv-rebase