David Woodhouse 66643de455 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>		2006-05-24 09:22:21 +01:00
..
acpi	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
asm-alpha	Remove unneeded _syscallX macros from user view in asm-*/unistd.h	2006-04-29 01:51:47 +01:00
asm-arm	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-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	Add standard include guard to asm-generic/signal and use compiler.h	2006-04-27 06:57:23 +01: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	Remove unneeded _syscallX macros from user view in asm-*/unistd.h	2006-04-29 01:51:47 +01: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 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-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 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-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 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-um	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01: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 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-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 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01: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	Move comment in mtd-abi.h to stop confusing unifdef	2006-04-25 15:00:06 +01:00
net	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
pcmcia	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
rdma
rxrpc
scsi	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
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