diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 07:24:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 07:24:17 -0800 |
| commit | 0c5445015c8e37d4f79c16fa51be398c4cb0e46c (patch) | |
| tree | d5043bad8b42de2872d18f4a5c8ff63492718d88 /net/unix/af_unix.c | |
| parent | Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | UAPI: Fix up empty files in arch/cris/ (diff) | |
| download | wireguard-linux-0c5445015c8e37d4f79c16fa51be398c4cb0e46c.tar.xz wireguard-linux-0c5445015c8e37d4f79c16fa51be398c4cb0e46c.zip | |
Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson.
... mainly the UAPI disintegration.
* tag 'cris-for-linus-3.8' of git://jni.nu/cris:
UAPI: Fix up empty files in arch/cris/
CRIS: locking: fix the return value of arch_read_trylock()
CRIS: use kbuild.h instead of defining macros in asm-offset.c
UAPI: (Scripted) Disintegrate arch/cris/include/asm
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions