From: David S. Miller <davem@davemloft.net>
Date: Thu, 12 Feb 2015 03:48:14 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~428
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=855e7e7174bade3f2b63077a81eea5aab525dbf6;p=pandora-kernel.git

Merge git://git./linux/kernel/git/torvalds/linux

I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.

I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

855e7e7174bade3f2b63077a81eea5aab525dbf6
Reading git-diff-tree failed