]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f96491) | patch
ext4: fix ext4 mismerge back in January
authorAl Viro <viro@ZenIV.linux.org.uk>
Mon, 23 Jul 2012 00:27:31 +0000 (20:27 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 23 Jul 2012 00:27:31 +0000 (20:27 -0400)
commite4436cfb8062d81c6a3e5490137b06742840e6bb
tree12bc0bdb34ac8f908b2746dfbc7ada2eefeccd61tree | snapshot
parent8f96491de883d7c736a859de1362a1181e3db092commit | diff
ext4: fix ext4 mismerge back in January

Duplicate caused, AFAICS, by mismerge in
24c802f1e6248f44e0f7cc89e1ced53e42327503>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
fs/ext4/ioctl.c diff | blob | history
Linux Kernel Source Tree.