Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Apr 2013 14:07:46 +0000 (07:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Apr 2013 14:07:46 +0000 (07:07 -0700)
Pull crypto fix from Herbert Xu:
 "This fixes a kernel memory leak in the algif interface"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif - suppress sending source address information in recvmsg


Trivial merge