projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81770f4 0f23ae7)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2014 20:10:53 +0000 (13:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2014 20:10:53 +0000 (13:10 -0700)
commit46be7b73e82453447cd97b3440d523159eab09f8
treeb54c7a44f475e2bfed4b80331cbb836b77e096ebtree | snapshot (tar.gz zip)
parent81770f41447bb2534d29b58a14ab501c0fb1e671commit | diff
parent0f23ae74f589304bf33233f85737f4fd368549ebcommit | diff
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