]> 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)
commit98f61bad74076e667be76bacb48b46ab6afb61de
treeb0f919c616ed6ddf31dfdc817975e87d8d2fa421
parent4073df19f74ec24ec6c7dcd0bc507bb4d5946147
parentbd0c64367ce49530f4d3b317d9bf17e37b9368d6
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
620631028250b29b. 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>