diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-13 11:26:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-13 11:26:34 -0800 |
| commit | fae1aa4a0bcfdd35735a38949650216aee964474 (patch) | |
| tree | d733a7bcc3921e253d7010cdcaa39c83394e9c8f /net/unix/af_unix.c | |
| parent | console ASCII glyph 1:1 mapping (diff) | |
| parent | MIPS: IP32: Update defconfig (diff) | |
| download | linux-dev-fae1aa4a0bcfdd35735a38949650216aee964474.tar.xz linux-dev-fae1aa4a0bcfdd35735a38949650216aee964474.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: IP32: Update defconfig
MIPS: Add missing calls to plat_unmap_dma_mem.
MIPS: Kconfig: Fix the arch-specific header path
MIPS: Use EI/DI for MIPS R2.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions