Merge 4.12-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 May 2017 06:58:50 +0000 (08:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 May 2017 06:58:50 +0000 (08:58 +0200)
commit639e1c739bf53814b67a1d5f945d76fd4358453c
treed3bad09907d05228851267b1ddd3ba3a6fd39fe0
parent0687090acf0d0bee585fa0ec29cf5b1fd48cefee
parent08332893e37af6ae779367e78e444f8f9571511d
Merge 4.12-rc2 into staging-next

We want the staging tree fixes in here as well to handle the merge
issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ccree/ssi_request_mgr.c