mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-18 18:48:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a
linux/include
History
Sam Ravnborg e880e8701c sparc: Merge asm-sparc{,64}/sockios.h 
:$ diff -u include/asm-sparc/sockios.h include/asm-sparc64/sockios.h
:-- include/asm-sparc/sockios.h	2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/sockios.h	2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef _ASM_SPARC_SOCKIOS_H
:-#define _ASM_SPARC_SOCKIOS_H
:+#ifndef _ASM_SPARC64_SOCKIOS_H
:+#define _ASM_SPARC64_SOCKIOS_H
:
: /* Socket-level I/O control calls. */
: #define FIOSETOWN 	0x8901
:@@ -10,5 +10,5 @@
: #define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
: #define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
:
:-#endif /* !(_ASM_SPARC_SOCKIOS_H) */
:+#endif /* !(_ASM_SPARC64_SOCKIOS_H) */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-07-17 21:41:35 -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
smp_call_function: get rid of the unused nonatomic/retry argument
2008-06-26 11:24:35 +02:00
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
atmel-mci: Driver for Atmel on-chip MMC controllers
2008-07-15 14:14:49 +02:00
asm-blackfin
Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.
2008-06-19 17:46:39 +08:00
asm-cris
cris: types: use <asm-generic/int-*.h> for the cris architecture
2008-05-02 16:18:20 -07:00
asm-frv
frv: fix irqs_disabled() to return an int, not an unsigned long
2008-07-12 14:33:42 -07:00
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
h8300: fix typo in header guard
2008-06-06 11:29:12 -07:00
asm-ia64
ACPI : Create "idle=nomwait" bootparam
2008-07-16 23:27:05 +02:00
asm-m32r
m32r: convert to generic helpers for IPI function calls
2008-06-26 11:22:57 +02:00
asm-m68k
m68k: Add ext2_find_{first,next}_bit() for ext4
2008-06-12 18:05:39 -07:00
asm-m68knommu
m68knommu: rework definition of HZ
2008-05-01 08:08:36 -07:00
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
MN10300: Fix typo in header guard
2008-05-28 07:59:06 -07:00
asm-parisc
parisc: convert to generic helpers for IPI function calls
2008-06-26 11:22:57 +02:00
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
sh: convert to generic helpers for IPI function calls
2008-06-26 11:22:58 +02:00
asm-sparc
sparc: Merge asm-sparc{,64}/ioctls.h
2008-07-17 21:41:16 -07:00
asm-sparc64
sparc: Merge asm-sparc{,64}/sockios.h
2008-07-17 21:41:35 -07:00
asm-um
uml: activate_mm: remove the dead PF_BORROWED_MM check
2008-06-06 11:36:22 -07:00
asm-v850
v850: fix typo in header guard
2008-06-06 11:29:12 -07:00
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
asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace
2008-05-14 19:11:14 -07:00
crypto
crypto: hash - Move ahash functions into crypto/hash.h
2008-07-10 20:35:18 +08:00
drm
drm/radeon: fixup issue with radeon and PAT support.
2008-07-15 15:48:05 +10:00
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
V4L/DVB (8092): videodev: simplify and fix standard enumeration
2008-06-26 15:58:57 -03:00
mtd
…
net
net-sched: change tcf_destroy_chain() to clear start of filter list
2008-07-01 19:52:38 -07:00
pcmcia
pcmcia: (re)move {pcmcia,pccard}_get_status
2008-06-24 15:33:44 +02:00
rdma
RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr
2008-07-14 23:48:53 -07:00
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
ALSA: Release v1.0.17
2008-07-14 09:54:43 +02:00
video
fbdev: platforming hecubafb and n411
2008-04-28 08:58:41 -07:00
xen
xen: implement ptep_modify_prot_start/commit
2008-06-25 15:17:23 +02:00
Kbuild
drm: reorganise drm tree to be more future proof.
2008-07-14 10:45:01 +10:00