summaryrefslogtreecommitdiff
path: root/crypto/salsa20_generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 17:43:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 17:43:08 +0200
commitdfa4a423cf80afe8f81a36d8e663961c4acca343 (patch)
tree1ac7fa67256148b8fd8360d4d465e945800bb9df /crypto/salsa20_generic.c
parent7b86572a7a920e3181b041b8d1a01582e4610b66 (diff)
parent7e49b1c8c6d64f55ac83e1f5901b22fa9e51ab80 (diff)
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86-64, unistd: Remove bogus __IGNORE_getcpu x86, mm, trivial: Remove unnecessary get_order() in free_thread_info() x86, cleanup: Remove unneeded version.h include from arch/x86/
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions