James Bottomley 7b16318dea Fix up SCSI mismerge ...

I forgot to do a git-update-cache on the merged files ...

2005-12-15 20:17:02 -06:00

..

acpi

…

asm-alpha

[PATCH] mm: fill arch atomic64 gaps

2005-11-23 16:08:39 -08:00

asm-arm

[ARM] 3205/1: Handle new EABI relocations when loading kernel modules.

2005-12-14 22:04:22 +00:00

asm-arm26

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-cris

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-frv

[PATCH] FRV: Make the FRV arch work again

2005-11-28 14:42:23 -08:00

asm-generic

Merge x86-64 update from Andi

2005-11-14 19:56:02 -08:00

asm-h8300

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-i386

x86: Fix silly typo in recent <asm/signal.h> fixes

2005-11-17 10:04:31 -08:00

asm-ia64

[IA64] Split 16-bit severity field in sal_log_record_header

2005-12-13 10:41:49 -08:00

asm-m32r

[PATCH] m32r: M3A-2170(Mappi-III) IDE support

2005-11-28 14:42:24 -08:00

asm-m68k

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-m68knommu

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-mips

[PATCH] ide: AU1200 IDE update

2005-12-15 02:17:46 +01:00

asm-parisc

[PARISC] Always spinlock tlb flush operations to ensure preempt safety

2005-11-17 16:44:14 -05:00

asm-powerpc

[PATCH] powerpc: Add missing icache flushes for hugepages

2005-12-09 16:30:48 +11:00

asm-ppc

Merge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr

2005-11-19 14:25:23 +11:00

asm-s390

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-sh

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-sh64

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

asm-sparc

[PATCH] sun4c_memerr_reg __iomem annotations

2005-12-15 10:01:29 -08:00

asm-sparc64

[PATCH] sparc: convert IO remapping to VM_PFNMAP

2005-11-28 14:35:36 -08:00

asm-um

[PATCH] uml: eliminate anonymous union and clean up symlink lossage

2005-11-22 09:13:41 -08:00

asm-v850

[PATCH] v850: use generic hardirq code

2005-11-15 08:59:20 -08:00

asm-x86_64

[PATCH] mm: fill arch atomic64 gaps

2005-11-23 16:08:39 -08:00

asm-xtensa

[PATCH] atomic: inc_not_zero

2005-11-13 18:14:16 -08:00

keys

…

linux

Merge by hand (conflicts in scsi_lib.c)

2005-12-15 17:35:24 -06:00

math-emu

…

media

[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 4

2005-12-12 08:57:44 -08:00

mtd

[MTD] user-abi: Clean up trailing white spaces

2005-11-07 14:43:11 +01:00

net

[DECNET]: add memory buffer settings

2005-12-05 13:42:06 -08:00

pcmcia

…

rdma

[IB] uverbs: have kernel return QP capabilities

2005-11-10 10:22:50 -08:00

rxrpc

…

scsi

Fix up SCSI mismerge

2005-12-15 20:17:02 -06:00

sound

[ALSA] version 1.0.10rc3

2005-11-07 14:35:14 +01:00

video

…