| commit | 57afc62e9422954329adecdb8251cc232e9fe308 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri May 30 13:41:40 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri May 30 13:41:40 2014 -0400 |
| tree | d2f3410ff4d193e28b67c31efbcd6b341520f38f | |
| parent | a3b9d55350d6e54f4b4ed80eeda7a1b8f27c1db9 [diff] | |
| parent | 6857bb96271cd40ffb38825d43897d716310e3db [diff] |
Merge tag 'nfc-next-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next Samuel Ortiz <sameo@linux.intel.com> says: "NFC: 3.16: Second pull request This is the 2nd NFC pull request for 3.16. We have: - Felica (Type3) tags support for trf7970a - Type 4b tags support for port100 - st21nfca DTS typo fix - A few sparse warning check fixes" Signed-off-by: John W. Linville <linville@tuxdriver.com>