aboutsummaryrefslogtreecommitdiff
path: root/crypto/salsa20_generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-11 09:47:28 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-11 09:47:28 -0700
commitbaadac8b10c5ac15ce3d26b68fa266c8889b163f (patch)
tree8ab1c758f8b2fe21351102d9845c0f8ec81a52cf /crypto/salsa20_generic.c
parent051a82fc0c450f6ca649acf684586477aa6d5c6a (diff)
parent985a34bd75cc8c96e43f00dcdda7c3fdb51a3026 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: remove quicklists x86: ia32 syscall restart fix x86: ioremap, remove WARN_ON()
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions