diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-07-31 21:15:50 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-31 21:15:50 +0200 |
| commit | 11a45820d02ee78ad22bb95d5abb94950a355d8d (patch) | |
| tree | 43ac5d0277ec5939875cf8e1863245bd60f5b51a /net/atm | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto... (diff) | |
| parent | NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOAD (diff) | |
| download | linux-11a45820d02ee78ad22bb95d5abb94950a355d8d.tar.xz linux-11a45820d02ee78ad22bb95d5abb94950a355d8d.zip | |
Merge tag 'nfc-fixes-3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes
Samuel Ortiz <sameo@linux.intel.com> 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 <linville@tuxdriver.com>
Diffstat (limited to 'net/atm')
0 files changed, 0 insertions, 0 deletions