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: 3c459f1 6bbc773)

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	24c802f1e6248f44e0f7cc89e1ced53e42327503
tree	cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e	tree \| snapshot
parent	3c459f1a4645f7e75cb60a55c5646a724103f9e6	commit \| diff
parent	6bbc773e151ca0a164bab5f8500e951a97392c8a	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.