diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-01-08 13:36:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-01-08 13:36:17 -0500 |
commit | 2eff7c791a18a31a6ede36172258c4e05d632fac (patch) | |
tree | b0f919c616ed6ddf31dfdc817975e87d8d2fa421 /mm/mmap.c | |
parent | e46316c86ee6a5e8909fa228455f9cf1dbee6957 (diff) | |
parent | d31652a26bc9e752a99b6ac3b61353129934e451 (diff) | |
download | linux-2eff7c791a18a31a6ede36172258c4e05d632fac.tar.gz linux-2eff7c791a18a31a6ede36172258c4e05d632fac.tar.bz2 linux-2eff7c791a18a31a6ede36172258c4e05d632fac.zip |
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
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>
Diffstat (limited to 'mm/mmap.c')
0 files changed, 0 insertions, 0 deletions