diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 00:30:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 00:30:14 +0200 |
| commit | c25d5180441e344a3368d100c57f0a481c6944f7 (patch) | |
| tree | 1aa053650b49f987effcbc91184c9a4208d402b1 /net/ipv4/cipso_ipv4.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | [MIPS] Pass NULL not 0 for pointer value. (diff) | |
| download | linux-c25d5180441e344a3368d100c57f0a481c6944f7.tar.xz linux-c25d5180441e344a3368d100c57f0a481c6944f7.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] Pass NULL not 0 for pointer value.
[MIPS] IP27: Make declaration of setup_replication_mask a proper prototype.
[MIPS] BigSur: More useful defconfig.
[MIPS] Cleanup definitions of speed_t and tcflag_t.
[MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c
[MIPS] Optimize and cleanup get_saved_sp, set_saved_sp
[MIPS] <asm/irq.h> does not need pt_regs anymore.
[MIPS] Workaround for bug in gcc -EB / -EL options.
[MIPS] Fix timer setup for Jazz
Diffstat (limited to 'net/ipv4/cipso_ipv4.c')
0 files changed, 0 insertions, 0 deletions