Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Dec 2013 17:27:47 +0000 (09:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Dec 2013 17:27:47 +0000 (09:27 -0800)
commitb6db4eb02e135304b820783383844a217dd4886a
tree4de322ea3639438427bc2777eb158956cd18c368
parent3f02ff5c2c69753666787ed125708d283a823ffb
parent389a5390583a18e45bc4abd4439291abec5e7a63
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "Unfortunately the last push that fixed a crash in the crypto
  scatterwalk code introduced a new crash when SG debugging is enabled.
  This fixes that"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: scatterwalk - Use sg_chain_ptr on chain entries