Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

author Dmitry Shmidt <dimitrysh@google.com>

Wed, 21 Sep 2016 21:32:54 +0000 (14:32 -0700)

committer Dmitry Shmidt <dimitrysh@google.com>

Wed, 21 Sep 2016 21:32:54 +0000 (14:32 -0700)
author Dmitry Shmidt <dimitrysh@google.com>
Wed, 21 Sep 2016 21:32:54 +0000 (14:32 -0700)
committer Dmitry Shmidt <dimitrysh@google.com>
Wed, 21 Sep 2016 21:32:54 +0000 (14:32 -0700)
diff --cc fs/ext4/inode.c
Simple merge
diff --cc kernel/sched/fair.c
Simple merge
author	Dmitry Shmidt <dimitrysh@google.com>
	Wed, 21 Sep 2016 21:32:54 +0000 (14:32 -0700)
committer	Dmitry Shmidt <dimitrysh@google.com>
	Wed, 21 Sep 2016 21:32:54 +0000 (14:32 -0700)
		1	2
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	patch \|	diff1 \|	diff2 \|	blob \| history