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

…

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

…

asm-cris

…

asm-frv

…

asm-generic

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

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

asm-h8300

…

asm-i386

…

asm-ia64

…

asm-m32r

…

asm-m68k

…

asm-m68knommu

…

asm-mips

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

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

asm-parisc

…

asm-powerpc

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

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

asm-ppc

…

asm-s390

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

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

asm-sh

…

asm-sh64

…

asm-sparc

…

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

…

asm-x86_64

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

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

asm-xtensa

…

keys

…

linux

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

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

math-emu

…

media

…

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

…

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

…

video

…