Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Apr 2013 19:31:57 +0000 (15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Apr 2013 19:31:57 +0000 (15:31 -0400)
commit17a2911f3395d66694fcbd2e8970015904d9b034
treec93e40197d4614b5183f86f0335c5c7abcee31aa
parent94dace10142790ddeb0a3a7b8b33d9540d30c79f
parenta8a48e60a468084ef6ec23c78e8903c9e0ba7a4c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
net/nfc/llcp_sock.c