| commit | 1076182240a294830fb7acdb191e683df840baa7 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Feb 24 14:42:54 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Feb 24 14:42:54 2014 -0500 |
| tree | bcb9f0d9a4bd9116121a4b705b8bba9d2210d665 | |
| parent | 694d82d913d18c6c6872b0dc93294fdf9c245667 [diff] | |
| parent | 44a589ca2de4d7980f8b335481a09bf818065dbe [diff] |
Merge tag 'nfc-fixes-3.14-1' of git://git.kernel.org/pub/scm/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>