]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e0bbb8 03ced61)
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)
commit2980788cfa613f3db6c415f6f901dd2ce7509b24
treeef5826a0b818ef6130c67da63a8bb8aa81b19ddetree | snapshot
parent2e0bbb86e477a8bd07f1348ab3590d73b4d3bf70commit | diff
parent03ced614b6845a0d93eaf75fa806d63b64b74e97commit | 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.