Merge tag 'nfc-next-3.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Nov 2012 18:22:03 +0000 (13:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Nov 2012 18:22:03 +0000 (13:22 -0500)
Samuel says:

"This is the 2nd NFC pull request for 3.8.

With this one we have:

- A few HCI improvements in preparation for an upcoming HCI chipset support.
- A pn544 code cleanup after the old driver was removed.
- An LLCP improvement for notifying user space when one peer stops ACKing I
  frames."

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

Trivial merge