projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2313f75 bf18f21)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2010 15:23:03 +0000 (07:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Feb 2010 15:23:03 +0000 (07:23 -0800)
commit54340aecd900bdb51a672639b3c6ae912d166aca
tree830e5cc6a0dbd5cb590b8484c4234bd65073d1d7tree | snapshot
parent2313f75c347006d37f317cbdca410210f2ea19b0commit | diff
parentbf18f2159865ce589664a6b5e1ab95235bc5e9b8commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: apply updated fallocate i_size fix
  Btrfs: do not try and lookup the file extent when finishing ordered io
  Btrfs: Fix oopsen when dropping empty tree.
  Btrfs: remove BUG_ON() due to mounting bad filesystem
  Btrfs: make error return negative in btrfs_sync_file()
  Btrfs: fix race between allocate and release extent buffer.
fs/btrfs/file.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.