]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b4dc27 d94a411)
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)
commitfd4360ede1f9d1967ca769ae22bfe77b57c7f53e
treeef5826a0b818ef6130c67da63a8bb8aa81b19ddetree | snapshot
parent8b4dc27105e531451421a24dbb2e1e55bf6673d1commit | diff
parentd94a411cba225d454686c9af77bcc6f4358e67bfcommit | 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
Linux Kernel Source Tree.