projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb38500 ceab36e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2009 02:03:09 +0000 (19:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2009 02:03:09 +0000 (19:03 -0700)
commitd6a0967c90dced0a8baf502e6f3d5862fd5a5805
treee0242d5077730dabc4102b7abad9ee0c41e33bc0tree | snapshot
parentfb385003c4ac9634cf2448f6ded81e5fd1190c1fcommit | diff
parentceab36edd3d3ad3ffd01d41d6d1e05ac1ff8357ecommit | diff
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix balancing oops when invalidate_inode_pages2 returns EBUSY
  Btrfs: correct error-handling zlib error handling
  Btrfs: remove superfluous NULL pointer check in btrfs_rename()
  Btrfs: make sure the async caching thread advances the key
  Btrfs: fix btrfs_remove_from_free_space corner case
fs/btrfs/inode.c diff1 | diff2 | blob | history
John Crispins staging tree