Ilan Elias 11ee51589a 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>

2012-01-24 14:08:39 -05:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

asm-generic

thp: add tlb_remove_pmd_tlb_entry

2012-01-12 20:13:08 -08:00

crypto

crypto: serpent-sse2 - add lrw support

2011-11-21 16:13:24 +08:00

drm

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

2012-01-10 11:04:36 -08:00

keys

…

linux

ssb: SPROM: extract each core power info

2012-01-24 14:06:04 -05:00

math-emu

…

media

Merge branch 'depends/rmk/restart' into next/cleanup

2012-01-07 11:51:28 +00:00

misc

[media] altera-stapl: it is time to move out from staging

2011-09-23 15:00:57 -03:00

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

2012-01-09 18:18:36 +00:00

net

NFC: Increase NCI deactivate timeout

2012-01-24 14:08:39 -05:00

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

rdma

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2012-01-10 10:36:08 -08:00

sound

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

target

target: remove the unused se_dev_list

2011-12-06 06:00:57 +00:00

trace

vmscan/trace: Add 'file' info to trace_mm_vmscan_lru_isolate()

2012-01-12 20:13:08 -08:00

video

ARM: OMAP: HWMOD: Unify DSS resets for OMAPs

2011-11-08 03:16:13 -07:00

xen

Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2012-01-10 10:09:59 -08:00

Kbuild

…