Sam Ravnborg c8b8be5427 sparc: Merge asm-sparc{,64}/socket.h ... :$ diff -u include/asm-sparc/socket.h include/asm-sparc64/socket.h :-- include/asm-sparc/socket.h 2008-06-13 06:46:39.000000000 +0200 :++ include/asm-sparc64/socket.h 2008-06-13 06:46:39.000000000 +0200 :@@ -48,11 +48,10 @@ : #define SO_TIMESTAMPNS 0x0021 : #define SCM_TIMESTAMPNS SO_TIMESTAMPNS : :-#define SO_MARK 0x0022 :- : /* Security levels - as per NRL IPv6 - don't actually do anything */ : #define SO_SECURITY_AUTHENTICATION 0x5001 : #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 : #define SO_SECURITY_ENCRYPTION_NETWORK 0x5004 : :+#define SO_MARK 0x0022 : #endif /* _ASM_SOCKET_H */ Signed-off-by: Sam Ravnborg <sam@ravnborg.org>		2008-07-17 21:41:27 -07:00
..
acpi	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-07-16 17:25:46 -07:00
asm-alpha
asm-arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2008-07-16 15:17:52 -07:00
asm-avr32
asm-blackfin
asm-cris
asm-frv
asm-generic	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-07-16 17:25:46 -07:00
asm-h8300
asm-ia64	ACPI : Create "idle=nomwait" bootparam	2008-07-16 23:27:05 +02:00
asm-m32r
asm-m68k
asm-m68knommu
asm-mips	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2008-07-16 15:17:52 -07:00
asm-mn10300
asm-parisc
asm-powerpc	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
asm-s390	[S390] qdio: new qdio driver.	2008-07-17 17:22:10 +02:00
asm-sh
asm-sparc	sparc: Merge asm-sparc{,64}/ioctls.h	2008-07-17 21:41:16 -07:00
asm-sparc64	sparc: Merge asm-sparc{,64}/socket.h	2008-07-17 21:41:27 -07:00
asm-um
asm-v850
asm-x86	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-17 10:38:59 -07:00
asm-xtensa
crypto
drm
keys
linux	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2	2008-07-17 10:55:51 -07:00
math-emu
media
mtd
net
pcmcia
rdma
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-07-15 18:58:04 -07:00
sound
video
xen
Kbuild