David Woodhouse 8a84fc15ae Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

2006-10-01 17:55:53 +01:00

..

acorn

i2c-algo-bit: Discard the mdelay data struct member

2006-09-26 15:38:51 -07:00

acpi

[PATCH] maximum latency tracking infrastructure

2006-10-01 00:39:19 -07:00

amba

…

ata

[libata] Don't use old-EH ->eng_timeout() hook when not needed

2006-09-27 05:41:13 -04:00

atm

[ATM] he: Fix __init/__devinit conflict

2006-09-24 20:09:33 -07:00

base

[PATCH] hot-add-mem x86_64: use CONFIG_MEMORY_HOTPLUG_SPARSE

2006-10-01 00:39:18 -07:00

block

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

bluetooth

[Bluetooth] Code cleanup for the HCI UART driver

2006-09-28 18:01:30 -07:00

cdrom

[PATCH] BLOCK: Make it possible to disable the block layer [try #6]

2006-09-30 20:52:31 +02:00

char

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

2006-10-01 00:40:55 -07:00

clocksource

…

connector

[PATCH] Process Events: Fix biarch compatibility issue. use __u64 timestamp

2006-07-31 13:28:36 -07:00

cpufreq

[CPUFREQ] Fix cut-n-paste bug in suspend printk

2006-09-26 23:02:34 -04:00

crypto

[CRYPTO] padlock: Convert padlock-sha to use crypto_hash

2006-09-21 11:46:22 +10:00

dio

…

dma

[I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine

2006-07-21 14:50:13 -07:00

edac

[PATCH] drivers/edac/edac_mc.h must #include <linux/platform_device.h>

2006-08-06 08:57:46 -07:00

eisa

[PATCH] EISA bus MODALIAS attributes support

2006-09-27 08:26:19 -07:00

fc4

[PATCH] Remove ->rq_status from struct request

2006-09-30 20:29:23 +02:00

firmware

[PATCH] DMI: Decode and save OEM String information

2006-09-29 09:18:09 -07:00

hwmon

[PATCH] hdaps: support Lenovo ThinkPad T60

2006-10-01 00:39:24 -07:00

i2c

[PATCH] proper flags type of spin_lock_irqsave()

2006-10-01 00:39:21 -07:00

ide

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

ieee1394

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2006-09-30 09:38:19 -07:00

infiniband

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

input

[PATCH] update legacy io handling for pmac

2006-10-01 00:39:23 -07:00

isdn

[PATCH] EICON ISDN: Removed unused definitions for OS_SEEK_*

2006-10-01 00:39:21 -07:00

leds

[PATCH] leds: turn LED off when changing triggers

2006-10-01 00:39:21 -07:00

macintosh

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

mca

…

md

[PATCH] BLOCK: Make it possible to disable the block layer [try #6]

2006-09-30 20:52:31 +02:00

media

[PATCH] Generic boolean

2006-10-01 00:39:18 -07:00

message

[PATCH] i2o: Switch to pci_get API

2006-10-01 00:39:23 -07:00

mfd

[PATCH] ucb1x00-ts: handle errors from input_register_device()

2006-09-29 09:18:10 -07:00

misc

[PATCH] inode-diet: Eliminate i_blksize from the inode structure

2006-09-27 08:26:18 -07:00

mmc

[PATCH] mmc (mainly): add "or later" clause to licence statement.

2006-10-01 00:39:23 -07:00

mtd

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-10-01 17:55:53 +01:00

net

[PATCH] Remove readv/writev methods and use aio_read/aio_write instead

2006-10-01 00:39:28 -07:00

nubus

…

oprofile

[PATCH] inode-diet: Eliminate i_blksize from the inode structure

2006-09-27 08:26:18 -07:00

parisc

[PATCH] irq-flags: PARISC: Use the new IRQF_ constants

2006-07-02 13:58:52 -07:00

parport

[PATCH] update legacy io handling for pmac

2006-10-01 00:39:23 -07:00

pci

[PATCH] PCI quirks update

2006-10-01 00:39:17 -07:00

pcmcia

[PATCH] omap_cf works again (sync with linux-omap tree)

2006-10-01 00:39:25 -07:00

pnp

[PATCH] update legacy io handling for pmac

2006-10-01 00:39:23 -07:00

rapidio

…

rtc

[PATCH] RTC: rtc-ds1553, rtc-ds1742 update

2006-10-01 00:39:25 -07:00

s390

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

sbus

[OPENPROMIO]: Handle current_node being NULL correctly.

2006-09-18 01:47:13 -07:00

scsi

[PATCH] completions: lockdep annotate on stack completions

2006-10-01 00:39:24 -07:00

serial

[PATCH] ioremap balanced with iounmap for drivers/serial/sunsu.c

2006-10-01 00:39:32 -07:00

sh

…

sn

[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants

2006-07-02 13:58:50 -07:00

spi

[PATCH] lockdep: annotate on-stack completions

2006-07-03 15:27:09 -07:00

tc

[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants

2006-07-02 13:58:50 -07:00

telephony

…

usb

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

video

Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6

2006-09-30 09:36:56 -07:00

w1

[PATCH] w1: remove drivers/w1/w1.h

2006-07-12 15:38:28 -07:00

zorro

…

Kconfig

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

Makefile

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00