This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Trond Myklebust 70ac4385a1 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ ...

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

2006-06-20 20:46:21 -04:00

..

acpi

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

asm-alpha

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-arm

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-arm26

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-cris

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-frv

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-generic

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-h8300

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-i386

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-05-24 09:22:21 +01:00

asm-ia64

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-05-24 09:22:21 +01:00

asm-m32r

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-m68k

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-m68knommu

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-mips

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-parisc

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-powerpc

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-ppc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-05-24 09:22:21 +01:00

asm-s390

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-sh

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-sh64

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-sparc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-05-24 09:22:21 +01:00

asm-sparc64

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-um

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-v850

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

asm-x86_64

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

asm-xtensa

Remove unneeded _syscallX macros from user view in asm-*/unistd.h

2006-04-29 01:51:47 +01:00

keys

…

linux

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2006-06-20 20:46:21 -04:00

math-emu

…

media

Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)

2006-05-06 19:47:57 +01:00

mtd

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

net

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

pcmcia

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

rdma

IB/uverbs: Don't serialize with ib_uverbs_idr_mutex

2006-06-17 20:44:49 -07:00

rxrpc

…

scsi

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

sound

Fix integer types in <sound/hdsp.h> SNDRV_HDSP_IOCTL_GET_PEAK_RMS ioctl

2006-05-04 00:42:42 +01:00

video

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00