projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 92ef9ce 063c54d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2015 22:25:52 +0000 (14:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2015 22:25:52 +0000 (14:25 -0800)
commitbc208e0ee0f46744aac95c29366144271a6962bb
treed7336b6026ef51bf987273c1dc9c0a374052e5d8tree | snapshot
parent92ef9ce301ed98b2b963d2f3c5367904efc69fbacommit | diff
parent063c54dccdecb0479662778ddf54ee45aa55423dcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "We have one more fix for btrfs in my for-linus branch - this was a bug
  in the new raid5/6 scrubbing support"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix raid56 scrub failed in xfstests btrfs/072
John Crispins staging tree