| commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Feb 11 19:48:14 2015 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Wed Feb 11 19:48:14 2015 -0800 |
| tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 | |
| parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff [diff] | |
| parent | 59d53737a8640482995fea13c6e2c0fd016115d6 [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>