From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 24 Feb 2014 19:42:54 +0000 (-0500)
Subject: Merge tag 'nfc-fixes-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: v3.14-rc6~30^2~1^2^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1076182240a294830fb7acdb191e683df840baa7;p=kernel%2Fkernel-generic.git

Merge tag 'nfc-fixes-3.14-1' of git://git./linux/kernel/git/sameo/nfc-fixes

Samuel Ortiz <sameo@linux.intel.com> says:

"NFC: 3.14: First pull request

We only have one candidate for 3.14 fixes, and this is a NCI NULL
pointer dereference introduced during the 3.14 merge window."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

1076182240a294830fb7acdb191e683df840baa7