diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:47:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:47:58 -0800 |
commit | 3bd82263a0d770d2ab3efd37144993f4433a179c (patch) | |
tree | 0082aa8c22eb0b6ba97368b5eb42edcb241ab0f3 /crypto/serpent.c | |
parent | eef70b217a7ab46e8e0cf75982ad75d8305d5591 (diff) | |
parent | f9d62c009637f9581cdd7f6e430f8eec511c8587 (diff) |
Merge branch 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Disable GENERIC_HARDIRQS_NO__DO_IRQ for unconverted platforms.
sh: maple: Do not pass SLAB_POISON to kmem_cache_create()
Diffstat (limited to 'crypto/serpent.c')
0 files changed, 0 insertions, 0 deletions