diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 16:51:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 16:51:23 -0700 |
| commit | f436ab43614f105a4685c976a85a171bc112c802 (patch) | |
| tree | 21db536f54a642c627008c664e2679c0ff3ccbc3 /crypto/khazad.c | |
| parent | 6cd236e0057704d1f5c77908374079e021c83928 (diff) | |
| parent | 0c07f6115b779ae4597749d47dec228c6d2d1c7c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4449/1: more entries in arch/arm/boot/.gitignore
[ARM] 4452/1: Force the literal pool dump before reloc_end
[ARM] Update show_regs/oops register format
[ARM] Add support for pause_on_oops and display preempt/smp options
Diffstat (limited to 'crypto/khazad.c')
0 files changed, 0 insertions, 0 deletions