aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netlabel.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 15:30:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 15:30:14 -0700
commitc25d5180441e344a3368d100c57f0a481c6944f7 (patch)
tree1aa053650b49f987effcbc91184c9a4208d402b1 /include/net/netlabel.h
parentMerge 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)
downloadlinux-dev-c25d5180441e344a3368d100c57f0a481c6944f7.tar.xz
linux-dev-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 'include/net/netlabel.h')
0 files changed, 0 insertions, 0 deletions