Merge tag 'lsk-v3.18-15.08-android' into 'msm-3.18'

LSK Android 15.08 v3.18

A minor conflict in drivers/mmc/card/block.c was caused by internal
and upstream resolutions to the same issue being implemented
differently but equivalently. Keep the upstream version.

The conflict in kernel/cgroup.c is also due to two separate approaches
to the same fix. The internal version seems "more correct" and so
is kept.

Conflicts:
	drivers/mmc/card/block.c
	kernel/cgroup.c

Change-Id: I37f84630828d1b9cd8f03965272bd68ea9da5f7d
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>