From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Mon, 23 Jul 2012 00:27:31 +0000 (-0400)
Subject: ext4: fix ext4 mismerge back in January
X-Git-Tag: v3.6-rc1~69^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=254706056be7e4e161ae9675ead6cd4e269be966;p=pandora-kernel.git

ext4: fix ext4 mismerge back in January

Duplicate caused, AFAICS, by mismerge in
ff9cb1c4eead5e4c292e75cd3170a82d66944101>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
---

Reading git-diff-tree failed