Merge "mmc: block: Fix issue with deferred resume when CQ is enabled"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 9 Feb 2017 21:16:04 +0000 (13:16 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Thu, 9 Feb 2017 21:16:03 +0000 (13:16 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 9 Feb 2017 21:16:04 +0000 (13:16 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 9 Feb 2017 21:16:03 +0000 (13:16 -0800)
diff --cc drivers/mmc/card/block.c
Simple merge
diff --cc drivers/mmc/core/core.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 9 Feb 2017 21:16:04 +0000 (13:16 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 9 Feb 2017 21:16:03 +0000 (13:16 -0800)
		1	2
drivers/mmc/card/block.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/core/core.c	patch \|	diff1 \|	diff2 \|	blob \| history