summaryrefslogtreecommitdiff
path: root/crypto/salsa20_generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-14 03:47:31 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-14 03:47:31 +0400
commit51414d41084496aaefd06d7f19eb8206e8bfac2d (patch)
tree31c7624d28a564e1cc918a30b8570a3c001a9c7c /crypto/salsa20_generic.c
parent201f92e2ca789d529418da8fa027d5457f0df024 (diff)
parentf39b2dd9d065151a04f5996656d1f27a7eb32d45 (diff)
downloadlinux-51414d41084496aaefd06d7f19eb8206e8bfac2d.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: core: Bus width testing needs to handle suspend/resume
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions