From: Linus Torvalds Date: Tue, 16 Dec 2014 01:40:28 +0000 (-0800) Subject: Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139... X-Git-Tag: v3.19-rc1~67 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a68db9cb858d10820add66682ad4d412f9914288;p=linux-2.6-block.git Merge tag 'firewire-updates' of git://git./linux/kernel/git/ieee1394/linux1394 Pull firewire updates from Stefan Richter: "IEEE 1394 subsystem updates: - clean up firewire-ohci's longlived vm-mapping - use target instance lock instead of core lock in firewire-sbp2" * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: sbp2: replace card lock by target lock firewire: sbp2: replace some spin_lock_irqsave by spin_lock_irq firewire: sbp2: protect a reference counter properly firewire: core: document fw_csr_string's truncation of long strings firewire: ohci: replace vm_map_ram() with vmap() --- a68db9cb858d10820add66682ad4d412f9914288