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: 0de6774 f0c7d08)

author	Theodore Ts'o <tytso@mit.edu>
	Tue, 10 Jan 2012 16:54:07 +0000 (11:54 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 10 Jan 2012 16:54:07 +0000 (11:54 -0500)
commit	4ed3dcc69c72d56ada6489a7f9711ce3dcc9bb40
tree	cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e	tree \| snapshot
parent	0de6774e1ec5bb3b77d6619a05edd10be0e08e36	commit \| diff
parent	f0c7d087f9810973b25fd91e7feafea0c22a6d6c	commit \| diff

Merge branch 'for_linus' into for_linus_merged

Conflicts:
fs/ext4/ioctl.c

fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/extents.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ialloc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/xattr_security.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.