1
linux/include
Trond Myklebust 816724e65c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
2006-06-24 13:07:53 -04:00
..
acpi Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2006-06-23 07:52:36 -07:00
asm-alpha [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-arm [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-arm26 [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-cris
asm-frv [PATCH] frv: clean frv unistd.h 2006-06-23 07:42:55 -07:00
asm-generic [PATCH] squash duplicate page_to_pfn and pfn_to_page 2006-06-23 07:42:47 -07:00
asm-h8300 [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-i386 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2006-06-23 07:52:36 -07:00
asm-ia64 Auto-update from upstream 2006-06-23 13:46:23 -07:00
asm-m32r [PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use 2006-06-22 15:05:58 -07:00
asm-m68k [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-m68knommu [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-mips [PATCH] Au1550/1200: add missing PSC #define's, make OSS driver use the proper ones 2006-06-23 07:42:56 -07:00
asm-parisc [PATCH] Delete unused definitions of kvaddr_to_nid 2006-06-23 07:42:52 -07:00
asm-powerpc Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
asm-ppc Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
asm-s390 [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-sh
asm-sh64
asm-sparc [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-sparc64 [PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use 2006-06-22 15:05:58 -07:00
asm-um Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
asm-v850 [PATCH] adjust handle_IRR_event() return type 2006-06-23 07:43:08 -07:00
asm-x86_64 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2006-06-23 07:52:36 -07:00
asm-xtensa [PATCH] xtensa: remove verify_area macros 2006-06-23 07:43:02 -07:00
keys
linux Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
math-emu
media
mtd Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
net [NET]: fix net-core kernel-doc 2006-06-23 02:07:42 -07:00
pcmcia
rdma IB/uverbs: Don't serialize with ib_uverbs_idr_mutex 2006-06-17 20:44:49 -07:00
rxrpc
scsi Merge branch 'master' into upstream 2006-06-22 22:11:56 -04:00
sound [ALSA] version 1.0.12rc1 2006-06-22 21:35:11 +02:00
video