diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 05:25:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 05:25:33 (GMT) |
| commit | 0993537bff42edfbea7649975196cd2552c4b936 (patch) | |
| tree | 600c2f91fd97ac3f00a608322c17d70abd70d7a4 /crypto/salsa20_generic.c | |
| parent | 4b4d2b463461f1b86fd89353184e6f2938e7566b (diff) | |
| parent | 51387306b5c2b0c9eb1e2556de1b37267bb2b583 (diff) | |
| download | linux-fsl-qoriq-0993537bff42edfbea7649975196cd2552c4b936.tar.xz | |
Merge tag 'metag-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture changes from James Hogan:
- A change to remove the last dependence on bootloader exception
handlers so that QEMU can more easily boot an SMP Linux/Meta kernel
image directly.
- A fix for a minor off by one error in a BUG_ON condition found by Dan
Carpenter.
* tag 'metag-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: off by one in setup_bootmem_node()
metag: handle low level kicks directly
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions