Merge tag 'v3.18.15' into msm-3.18

Linux 3.18.15

Resolve trivial context conflicts as part of the merge.

Conflicts:
	drivers/mmc/card/block.c
	drivers/mmc/card/queue.h

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