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)
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


Trivial merge