diff options
| author | Russell King <[email protected]> | 2015-04-14 21:28:25 +0000 |
|---|---|---|
| committer | Russell King <[email protected]> | 2015-04-14 21:28:25 +0000 |
| commit | c848791f0336914a3081ea3fe029cf177d81de81 (patch) | |
| tree | 41e6c0003218b5a2075a3f09f781bf345029096e /net/unix/af_unix.c | |
| parent | ARM: update errata 430973 documentation to cover Cortex A8 r1p* (diff) | |
| parent | ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits (diff) | |
| parent | ARM: proc-arm94*.S: fix setup function (diff) | |
| download | kernel-c848791f0336914a3081ea3fe029cf177d81de81.tar.gz kernel-c848791f0336914a3081ea3fe029cf177d81de81.zip | |
Merge branches 'misc', 'vdso' and 'fixes' into for-next
Conflicts:
arch/arm/mm/proc-macros.S