diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-14 19:02:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-14 19:02:23 +0200 |
| commit | d6099aeb4a9aad5e7ab1c72eb119ebd52dee0d52 (patch) | |
| tree | 3b9bf3100f2027f1127c0024e28f50c6dcb486de /fs/ecryptfs/keystore.c | |
| parent | Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | ARM: 7851/1: check for number of arguments in syscall_get/set_arguments() (diff) | |
| download | linux-d6099aeb4a9aad5e7ab1c72eb119ebd52dee0d52.tar.xz linux-d6099aeb4a9aad5e7ab1c72eb119ebd52dee0d52.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Some more ARM fixes, nothing particularly major here. The biggest
change is to fix the SMP_ON_UP code so that it works with TI's Aegis
cores"
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7851/1: check for number of arguments in syscall_get/set_arguments()
ARM: 7846/1: Update SMP_ON_UP code to detect A9MPCore with 1 CPU devices
ARM: 7845/1: sharpsl_param.c: fix invalid memory access for pxa devices
ARM: 7843/1: drop asm/types.h from generic-y
ARM: 7842/1: MCPM: don't explode if invoked without being initialized first
Diffstat (limited to 'fs/ecryptfs/keystore.c')
0 files changed, 0 insertions, 0 deletions