Merge tag 'nfc-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Mar 2013 18:07:55 +0000 (14:07 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Mar 2013 18:07:55 +0000 (14:07 -0400)
commitde121989c8b5d946144354fce070f77e698e2cff
tree6767badc82de5ae1f859fde152664cc0c1edccf1
parent664899786cb49cb52f620e06ac19c0be524a7cfa
parent3bbc0ceb7ac2bf694d31362eea2c71a680e5deeb
Merge tag 'nfc-fixes-3.9-1' of git://git./linux/kernel/git/sameo/nfc-fixes

Samuel Ortiz <sameo@linux.intel.com> says:

This is the first NFC pull request for 3.9 fixes

With this one we have:

- A fix for properly decreasing socket ack log.
- A timer and works cleanup upon NFC device removal.
- A monitoroing socket cleanup round from llcp_socket_release.
- A proper error report to pending sockets upon NFC device removal.

Signed-off-by: John W. Linville <linville@tuxdriver.com>