From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Sep 2014 20:10:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: v3.17-rc6~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46be7b73e82453447cd97b3440d523159eab09f8;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "I've got a revert to fix a regression with btrfs device registration,
  and Filipe has part two of his fsync fix from last week"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: device_list_add() should not update list when mounted"
  Btrfs: set inode's logged_trans/last_log_commit after ranged fsync
---

46be7b73e82453447cd97b3440d523159eab09f8