Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e3e1288 a269029)

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	a107e5a3a473a2ea62bd5af24e11b84adf1486ff
tree	d36c2cb38d8be88d4d75cdebc354aa140aa0e470	tree \| snapshot
parent	e3e1288e86a07cdeb0aee5860a2dff111c6eff79	commit \| diff
parent	a269029d0e2192046be4c07ed78a45022469ee4c	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

Pandora Kernel Repository