tree afa37073eb74dc0f72294b45c7288d37eb18ef37
parent 365f0e173f44aad979c464eb8250f6138a9911ef
parent a4dff3043c231d57f982af635c9d2192ee40e5ae
author Linus Torvalds <torvalds@linux-foundation.org> 1338922527 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1338922527 -0700

Merge branch '3.5-merge-fixes' of git://git.kernel.org/pub/scm/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