nikhil18/android_kernel_sony_apq8064 — pull request #7 by nikhil18 (2014-08-12 16:17:10+00:00)
Title: Fix mismerge of 3.4.87 merge

Change-Id: I3be2d6890fd16a10a0e03ea30b6a249e513a3a83