From: Ilan Elias <ilane@ti.com>
Date: Sun, 8 Jan 2012 11:43:02 +0000 (+0200)
Subject: NFC: Increase NCI deactivate timeout
X-Git-Tag: v3.4-rc1~177^2~376^2^2~69
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ee51589a61fa836b1540293ad6c7dfd7de544a;p=pandora-kernel.git

NFC: Increase NCI deactivate timeout

Increase NCI deactivate timeout from 5 sec to 30 sec.
NCI deactivate procedure might take a long time,
depending on the local and remote parameters.

Signed-off-by: Ilan Elias <ilane@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed