From: John W. Linville Date: Wed, 8 Jan 2014 18:36:17 +0000 (-0500) Subject: Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Tag: Ubuntu-5.0.0-8.9~12297^2~4^2^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2eff7c791a18a31a6ede36172258c4e05d632fac;p=mirror_ubuntu-disco-kernel.git Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes Samuel Ortiz says: "This is the first NFC fixes pull request for 3.13. It only contains one fix for a regression introduced with commit e29a9e2ae165620d. Without this fix, we can not establish a p2p link in target mode. Only initiator mode works." Signed-off-by: John W. Linville --- 2eff7c791a18a31a6ede36172258c4e05d632fac