Merge git://github.com/herbertx/crypto
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Oct 2011 14:02:18 +0000 (17:02 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Oct 2011 14:02:18 +0000 (17:02 +0300)
* git://github.com/herbertx/crypto:
  crypto: ghash - Avoid null pointer dereference if no key is set


Trivial merge