From: John W. Linville Date: Wed, 31 Jul 2013 19:15:50 +0000 (-0400) Subject: Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Tag: v3.11-rc4~5^2~27^2^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=11a45820d02ee78ad22bb95d5abb94950a355d8d;p=users%2Fhch%2Fmisc.git Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes Samuel Ortiz says: 'This is the second NFC fixes pull request for 3.11. We have: - A build failure fix for the NCI SPI transport layer due to a missing CRC_CCITT Kconfig dependency. - A netlink command rename: CMD_FW_UPLOAD was merged during the 3.11 merge window but the typical terminology for loading a firmware to a target is firmware download rather than upload. In order to avoid any confusion in a file exported to userspace, we rename this command into CMD_FW_DOWNLOAD." Signed-off-by: John W. Linville --- 11a45820d02ee78ad22bb95d5abb94950a355d8d