git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a945f3 9f680ce)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:37:04 +0000 (18:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:37:04 +0000 (18:37 -0700)
commitd6cf853d4d73c268fc8920ac4e812ee26a12847c
treec909145638eb5c4897ea7e424759eb9b564ebe18tree | snapshot
parent6a945f38be5f2c198853069a336c887a51d1a238commit | diff
parent9f680ce04ea19dabbbafe01b57b61930a9b70741commit | diff
Merge branch 'master' of git://git./linux/kernel/git/mason/btrfs-unstable

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: make sure the chunk allocator doesn't create zero length chunks
  Btrfs: fix data enospc check overflow
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
Pandora Kernel Repository