projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e09dcd2 59d5373)
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)
commit855e7e7174bade3f2b63077a81eea5aab525dbf6
tree3423eb92315865d76cb8d488513bfef6ab9251d0tree | snapshot
parente09dcd2e7913aa50b5cb4836bc1e990e429e4affcommit | diff
parent59d53737a8640482995fea13c6e2c0fd016115d6commit | diff
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>
John Crispins staging tree