]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Feb 2015 03:48:14 +0000 (19:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Feb 2015 03:48:14 +0000 (19:48 -0800)
commit73dbe89adc051851452be0b7b58fa3869399c5ea
tree3423eb92315865d76cb8d488513bfef6ab9251d0
parenta3fc10165a3eb445b32f26de62b645f5c6d4ce56
parent0b2371946ddd4417b3f42c1b5191bfaa540ab135
Merge git://git.kernel.org/pub/scm/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>