Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Aug 2011 05:12:37 +0000 (22:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Aug 2011 05:12:37 +0000 (22:12 -0700)
commit7cd4767e696123cdb7447fbd7c281eb8c610c8e4
tree8a44dfbe0a131f6036eab36f887a058e9750fe69
parent1957e7fdefce4494cb8d8f09ee2317b7ede24994
parent6e5714eaf77d79ae1c8b47e3e040ff5411b717ec
Merge git://git./linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: Compute protocol sequence numbers and fragment IDs using MD5.
  crypto: Move md5_transform to lib/md5.c
include/linux/cryptohash.h