From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Dec 2013 19:11:57 +0000 (-0800)
Subject: Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v3.13-rc5~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba8b844f1b47f003d8d0af94275dc5bc7ab9665d;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'firewire-fix' of git://git./linux/kernel/git/ieee1394/linux1394

Pull firewire fixlet from Stefan Richter:
 "A one-liner to reenable WRITE SAME over SBP-2 like in v3.8...v3.12.
  Buggy targets which could malfunction when being subjected to this
  command are already sufficiently protected by a scsi_level check in sd
  + SCSI core"

* tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: sbp2: bring back WRITE SAME support
---

ba8b844f1b47f003d8d0af94275dc5bc7ab9665d