git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b6003b9 3c2c9cc)

author	Theodore Ts'o <tytso@mit.edu>
	Thu, 28 Oct 2010 03:44:47 +0000 (23:44 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 28 Oct 2010 03:44:47 +0000 (23:44 -0400)
commit	fcd13ccf00a7b985e2c79cd108780bb9fea1cbd3
tree	d36c2cb38d8be88d4d75cdebc354aa140aa0e470	tree \| snapshot
parent	b6003b914928019c209b66ca43642dd0d1a0ff1c	commit \| diff
parent	3c2c9ccf401fbab77cf8e2481d94f89167be8a23	commit \| diff

Merge branch 'next' into upstream-merge

Conflicts:
fs/ext4/inode.c
fs/ext4/mballoc.c
include/trace/events/ext4.h

15 files changed:

fs/ext4/extents.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/fsync.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ialloc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/resize.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/jbd2/checkpoint.c	diff1 \|	diff2 \|	blob \| history
fs/jbd2/commit.c	diff1 \|	diff2 \|	blob \| history
fs/jbd2/journal.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/writeback.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/ext4.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.