| commit | cb675f5ff39e12836591246e730e11ce648048d2 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Nov 20 13:22:03 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Nov 20 13:22:03 2012 -0500 |
| tree | 2e440fa1279d91f0791e3ee3248c2120bc4855aa | |
| parent | ac46ba4384d2c44c56702d0da591696045fba682 [diff] | |
| parent | be02b6b624005d47c388f799ce23714136430217 [diff] |
Merge tag 'nfc-next-3.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0 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>