Merge "slim: ngd: Avoid warning associated with TASK_INTERRUPTIBLE"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 13 Sep 2016 12:43:47 +0000 (05:43 -0700)

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

Tue, 13 Sep 2016 12:43:47 +0000 (05:43 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 13 Sep 2016 12:43:47 +0000 (05:43 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 13 Sep 2016 12:43:47 +0000 (05:43 -0700)
diff --cc drivers/slimbus/slim-msm-ngd.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 13 Sep 2016 12:43:47 +0000 (05:43 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 13 Sep 2016 12:43:47 +0000 (05:43 -0700)