projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 396e6e4 08c422c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLi Zefan <lizf@cn.fujitsu.com>
Wed, 11 Jan 2012 01:54:49 +0000 (09:54 +0800)
committerLi Zefan <lizf@cn.fujitsu.com>
Wed, 11 Jan 2012 01:54:49 +0000 (09:54 +0800)
1  2 
fs/btrfs/xattr.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/xattr.c
Simple merge