David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	sound/core/memalloc.c

2008-10-11 12:39:35 -07:00

..

accessibility

…

acpi

…

amba

…

ata

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

2008-10-11 12:39:35 -07:00

atm

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

2008-10-11 12:39:35 -07:00

auxdisplay

…

base

…

block

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

2008-10-11 12:39:35 -07:00

bluetooth

…

cdrom

…

char

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

2008-10-11 12:39:35 -07:00

clocksource

…

connector

…

cpufreq

…

cpuidle

…

crypto

…

dca

…

dio

…

dma

…

edac

…

eisa

…

firewire

…

firmware

…

gpio

…

gpu

…

hid

…

hwmon

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

2008-10-11 12:39:35 -07:00

i2c

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

ide

…

ieee1394

…

infiniband

…

input

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

2008-10-11 12:39:35 -07:00

isdn

…

leds

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

2008-10-11 12:39:35 -07:00

lguest

…

macintosh

…

mca

…

md

…

media

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

memstick

…

message

…

mfd

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

misc

…

mmc

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mtd

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

2008-10-11 12:39:35 -07:00

net

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

2008-10-11 12:39:35 -07:00

nubus

…

of

…

oprofile

…

parisc

…

parport

…

pci

Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

2008-10-11 20:17:36 +02:00

pcmcia

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

pnp

…

power

…

ps3

…

rapidio

…

regulator

…

rtc

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

2008-10-11 12:39:35 -07:00

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2008-10-11 09:33:18 -07:00

sbus

…

scsi

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

2008-10-11 12:39:35 -07:00

serial

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

2008-10-11 12:39:35 -07:00

sh

…

sn

…

spi

…

ssb

…

tc

…

telephony

…

thermal

…

uio

…

usb

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

video

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

2008-10-11 12:39:35 -07:00

virtio

…

w1

…

watchdog

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

2008-10-11 12:39:35 -07:00

xen

…

zorro

…

Kconfig

…

Makefile

…