git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e4e1118 d50f2ab)

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	ff9cb1c4eead5e4c292e75cd3170a82d66944101
tree	cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e	tree \| snapshot (tar.gz zip)
parent	e4e11180dfa545233e5145919b75b7fac88638df	commit \| diff
parent	d50f2ab6f050311dbf7b8f5501b25f0bf64a439b	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