From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jun 2012 18:55:27 +0000 (-0700)
Subject: Merge branch '3.5-merge-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab... 
X-Git-Tag: v3.5-rc2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f73639c637be9efa60b8020df5a1d3cf295eec5;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch '3.5-merge-fixes' of git://git./linux/kernel/git/nab/target-pending

Pull two scsi target fixes from Nicholas Bellinger:
 "The first is a small name-space collision fix from Stefan for the new
  sbp-target / ieee-1394 code, and second is the FILEIO backend
  conversion patch to always use O_DSYNC by default instead of O_SYNC as
  recommended by hch.  Note the latter is CC'ed stable."

* '3.5-merge-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target/file: Use O_DSYNC by default for FILEIO backends
  sbp-target: rename a variable to avoid name clash
---

5f73639c637be9efa60b8020df5a1d3cf295eec5