From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 12 Jun 2014 04:27:11 +0000 (-0400)
Subject: Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~45^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c1d5284c79fea050f115eadeec1dd1758e5c630;p=pandora-kernel.git

Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus

Backmerge of dcache.c changes from mainline.  It's that, or complete
rebase...

Conflicts:
	fs/splice.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

9c1d5284c79fea050f115eadeec1dd1758e5c630
Reading git-diff-tree failed