]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c292fe4 6e58ad6)
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2011 20:11:37 +0000 (12:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2011 20:11:37 +0000 (12:11 -0800)
commitf8f5ed7c996ad9426847ce09b828d415cb19bc06
treeef5826a0b818ef6130c67da63a8bb8aa81b19ddetree
parentc292fe4aae5aa5c089633bc40342d27c8275306acommit | diff
parent6e58ad69efe9f4c91eb15f6bc365293414c397cecommit | diff
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix up a undefined error in ext4_free_blocks in debugging code
  ext4: add blk_finish_plug in error case of writepages.
  ext4: Remove kernel_lock annotations
  ext4: ignore journalled data options on remount if fs has no journal
fs/ext4/inode.c diff1 | diff2 | blob | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG