diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-12-14 12:14:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-12-14 12:14:00 +0100 |
| commit | ed141f2890cdb738fc7131367f5fb15632bc3e60 (patch) | |
| tree | e6fd1b117b7d8968855e7f2d2f209ae102bf0be8 /crypto/blowfish_generic.c | |
| parent | Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus (diff) | |
| parent | ARM: wire up new pkey syscalls (diff) | |
| download | linux-ed141f2890cdb738fc7131367f5fb15632bc3e60.tar.xz linux-ed141f2890cdb738fc7131367f5fb15632bc3e60.zip | |
Merge branch 'syscalls' into for-linus
Conflicts:
arch/arm/include/asm/unistd.h
arch/arm/include/uapi/asm/unistd.h
arch/arm/kernel/calls.S
Diffstat (limited to 'crypto/blowfish_generic.c')
0 files changed, 0 insertions, 0 deletions