]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4b15d90 09e930e)
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)
commitd605bf77f840ce19cc0e5355e7e401817805ce4e
tree3423eb92315865d76cb8d488513bfef6ab9251d0tree | snapshot
parent4b15d90caa2d04001c7658adc962885ce519b36fcommit | diff
parent09e930eb51567ef482b620f960cd0d7d17f10115commit | diff
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>
Linux Kernel Source Tree.