Jeff Garzik 10a5fd5e6b Merge branch 'master' ...

Conflicts:

	drivers/scsi/libata-scsi.c
	include/linux/libata.h

2006-04-11 12:51:40 -04:00

..

acpi

…

asm-alpha

…

asm-arm

…

asm-arm26

…

asm-cris

…

asm-frv

…

asm-generic

…

asm-h8300

…

asm-i386

Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

2006-04-11 06:34:02 -07:00

asm-ia64

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

2006-04-11 06:40:17 -07:00

asm-m32r

…

asm-m68k

…

asm-m68knommu

…

asm-mips

…

asm-parisc

…

asm-powerpc

…

asm-ppc

…

asm-s390

…

asm-sh

…

asm-sh64

…

asm-sparc

[PATCH] sparc32 vga support

2006-04-11 06:18:54 -07:00

asm-sparc64

…

asm-um

…

asm-v850

…

asm-x86_64

[PATCH] x86_64: inline function prefix with __always_inline in vsyscall

2006-04-11 06:38:57 -07:00

asm-xtensa

…

keys

…

linux

Merge branch 'master'

2006-04-11 12:51:40 -04:00

math-emu

…

media

…

mtd

…

net

…

pcmcia

…

rdma

…

rxrpc

…

scsi

…

sound

…

video

…