Linus Torvalds cce0cac125 Merge master.kernel.org:/home/rmk/linux-2.6-arm ...

Manual conflict merge of arch/arm/Kconfig

2006-02-08 15:20:40 -08:00

..

acorn

[PATCH] move capable() to capability.h

2006-01-11 18:42:13 -08:00

acpi

[PATCH] x86_64: data/functions wrongly marked as __init with cpu hotplug.

2006-02-04 16:43:14 -08:00

amba

[ARM] Remove asm/irq.h includes from ARM drivers

2006-01-09 13:56:42 +00:00

atm

[ATM]: Remove unneeded kmalloc() return value casts + tiny whitespace cleanup

2006-01-10 13:09:01 -08:00

base

[PATCH] fix __user annotations in drivers/base/memory.c

2006-02-07 20:58:04 -05:00

block

[PATCH] cciss: softirq handler needs to save interrupt flags

2006-02-07 10:11:19 -08:00

bluetooth

[PATCH] Unlinline a bunch of other functions

2006-01-14 18:27:06 -08:00

cdrom

[PATCH] remove bogus asm/bug.h includes.

2006-02-07 20:56:35 -05:00

char

[PATCH] synclink_gt is PCI-only

2006-02-08 01:04:50 -05:00

connector

[PATCH] Switch getnstimestamp() calls to ktime_get_ts()

2006-01-10 08:01:39 -08:00

cpufreq

[CPUFREQ] Get rid of userspace policy struct, make userspace gov _PPC safe.

2006-01-27 10:36:49 -08:00

crypto

[CRYPTO] Allow AES C/ASM implementations to coexist

2006-01-09 14:15:39 -08:00

dio

[PATCH] Add dio_bus_type probe and remove methods

2006-01-13 11:26:07 -08:00

edac

[PATCH] drivers/edac/i82875p_edac.c __user annotations

2006-02-07 20:58:09 -05:00

eisa

…

fc4

…

firmware

[PATCH] dell_rbu: fix Bug 5854

2006-01-14 18:27:13 -08:00

hwmon

[PATCH] hwmon: Fix reboot on it87 driver load

2006-02-06 12:02:15 -08:00

i2c

[PATCH] i2c: Use ARRAY_SIZE macro

2006-02-06 12:02:15 -08:00

ide

[PATCH] ide: cast arguments to pr_debug() properly

2006-02-07 16:12:31 -08:00

ieee1394

Actually remove amdtp.[ch], cmp.[ch].

2006-01-16 19:21:57 -05:00

infiniband

[PATCH] IB: fix up major/minor sysfs interface for IB core

2006-02-06 12:17:17 -08:00

input

Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

2006-01-31 21:18:17 -08:00

isdn

[PATCH] mark HISAX_AMD7930 as broken

2006-02-08 01:05:34 -05:00

macintosh

ppc: fix up trivial Kconfig config selection

2006-02-08 07:51:17 -08:00

mca

…

md

[PATCH] md: Make sure rdev->size gets set for version-1 superblocks

2006-02-03 08:32:00 -08:00

media

[PATCH] drivers/media/video __user annotations and fixes

2006-02-08 01:03:39 -05:00

message

[PATCH] Fix i2o_scsi oops on abort

2006-02-05 11:06:51 -08:00

mfd

[PATCH] Add MCP bus_type probe and remove methods

2006-01-13 11:26:08 -08:00

misc

[SERIAL] Remove UPF_AUTOPROBE and UPF_BOOT_ONLYMCA

2006-01-21 20:06:14 +00:00

mmc

[MMC] Add MMC command type flags

2006-02-02 12:23:12 +00:00

mtd

[PATCH] arm: fix dependencies for MTD_XIP

2006-02-08 01:02:58 -05:00

net

[PATCH] type-safe min() in prism54

2006-02-08 01:05:26 -05:00

nubus

…

oprofile

[PATCH] move capable() to capability.h

2006-01-11 18:42:13 -08:00

parisc

[PARISC] Clean up printk in superio.c

2006-01-22 20:26:57 -05:00

parport

Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

2006-02-03 18:17:47 -08:00

pci

[PATCH] PowerPC/PCI Hotplug build break

2006-02-01 16:35:29 -08:00

pcmcia

[PATCH] Add pcmcia_bus_type probe and remove methods

2006-01-13 11:26:08 -08:00

pnp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

2006-02-01 22:08:23 -08:00

rapidio

[PATCH] Add rio_bus_type probe and remove methods

2006-01-13 11:26:10 -08:00

s390

[PATCH] s390: fix to_channelpath macro

2006-02-03 08:32:01 -08:00

sbus

[PATCH] remove unused tmp_buf_sem's

2006-01-14 10:41:42 -08:00

scsi

[PATCH] sg gfp_t annotations

2006-02-07 20:58:27 -05:00

serial

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2006-02-08 15:20:40 -08:00

sh

[PATCH] Add superhyway_bus_type probe and remove methods

2006-01-13 11:26:09 -08:00

sn

[PATCH] sn3 iomem annotations and fixes

2006-02-08 01:03:52 -05:00

spi

[PATCH] SPI: spi_butterfly, restore lost deltas

2006-02-06 12:17:17 -08:00

tc

[PATCH] remove bogus asm/bug.h includes.

2006-02-07 20:56:35 -05:00

telephony

[PATCH] ixj: fix writing silence check

2006-02-03 08:32:08 -08:00

usb

[PATCH] USB: Fix GPL markings on usb core functions.

2006-02-05 14:20:14 -08:00

video

[PATCH] remove bogus asm/bug.h includes.

2006-02-07 20:56:35 -05:00

w1

spelling: s/usefull/useful/

2006-01-10 00:08:17 +01:00

zorro

[PATCH] Add zorro_bus_type probe and remove methods

2006-01-13 11:26:10 -08:00

Kconfig

[PATCH] EDAC: core EDAC support code

2006-01-18 19:20:31 -08:00

Makefile

[PATCH] drivers/sn/ must be entered for CONFIG_SGI_IOC3

2006-01-26 13:22:03 -08:00