]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6cb2adcb2b748292f5684c9f7df6e92d4bf99637
treeb0f919c616ed6ddf31dfdc817975e87d8d2fa421
parent80864d52b592694a5be341a0a747af3a2992d253
parent9c5c48157944e56d8fd0041f0617144a60620177
Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/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
5d533619bf417948. 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>