projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3b9d55 6857bb9)
Merge tag 'nfc-next-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 30 May 2014 17:41:40 +0000 (13:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 May 2014 17:41:40 +0000 (13:41 -0400)
commit57afc62e9422954329adecdb8251cc232e9fe308
treed2f3410ff4d193e28b67c31efbcd6b341520f38ftree | snapshot
parenta3b9d55350d6e54f4b4ed80eeda7a1b8f27c1db9commit | diff
parent6857bb96271cd40ffb38825d43897d716310e3dbcommit | diff
Merge tag 'nfc-next-3.16-2' of git://git./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>
Unnamed repository; edit this file 'description' to name the repository.