Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Jan 2014 18:36:17 +0000 (13:36 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Jan 2014 18:36:17 +0000 (13:36 -0500)
commit2eff7c791a18a31a6ede36172258c4e05d632fac
treeb0f919c616ed6ddf31dfdc817975e87d8d2fa421
parente46316c86ee6a5e8909fa228455f9cf1dbee6957
parentd31652a26bc9e752a99b6ac3b61353129934e451
Merge tag 'nfc-fixes-3.13-1' of git://git./linux/kernel/git/sameo/nfc-fixes

Samuel Ortiz <sameo@linux.intel.com> 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 <linville@tuxdriver.com>