tree 31327d8b3ad3ade80ffae4c8a3aab3d43e20b062
parent 90a5dbf6974f70c756e7655961b73757fa8be6ae
parent ac58acb16ad3bd7d6c26c5a2e281f34d4cbdcf03
author David Hays <dhays90@gmail.com> 1410888188 -0700
committer Ethan Chen <intervigil@gmail.com> 1410888188 -0700

Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.43' into cm-11.0

Conflicts:
	fs/proc/task_mmu.c

Change-Id: Ie014403aec1279c5adec53138131671c444c4162