Merge tag 'nfc-fixes-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 19:42:54 +0000 (14:42 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Feb 2014 19:42:54 +0000 (14:42 -0500)
commit1076182240a294830fb7acdb191e683df840baa7
treebcb9f0d9a4bd9116121a4b705b8bba9d2210d665
parent694d82d913d18c6c6872b0dc93294fdf9c245667
parent44a589ca2de4d7980f8b335481a09bf818065dbe
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>