Ingo Molnar 0ce74d9296 Merge branch 'linus' into timers/hrtimers ...

Conflicts:
	sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c

2008-12-29 10:37:07 +01:00

..

accessibility

…

acpi

Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core

2008-12-25 13:11:00 +01:00

amba

…

ata

powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver

2008-12-21 02:54:29 -07:00

atm

atm: Driver for Solos PCI ADSL2+ card.

2008-12-26 01:26:11 -08:00

auxdisplay

…

base

…

block

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

2008-12-28 12:49:40 -08:00

bluetooth

…

cdrom

Commands needing to be retried require a complete re-initialization.

2008-12-12 16:04:26 +01:00

char

Merge branch 'linus' into timers/hrtimers

2008-12-29 10:37:07 +01:00

clocksource

clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI

2008-12-12 15:05:28 +01:00

connector

…

cpufreq

…

cpuidle

…

crypto

crypto: talitos - Ack done interrupt in isr instead of tasklet

2008-12-25 11:02:33 +11:00

dca

…

dio

…

dma

…

edac

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

eisa

…

firewire

firewire: fw-ohci: fix IOMMU resource exhaustion

2008-12-10 12:45:34 +01:00

firmware

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

2008-12-28 12:49:40 -08:00

gpio

…

gpu

drm/radeon: fix correctness of irq_enabled check for radeon.

2008-12-23 10:50:12 +10:00

hid

…

hwmon

…

i2c

sh: sh_mobile i2c clock framework support

2008-12-22 18:42:51 +09:00

ide

m68k: machw.h cleanup

2008-12-28 20:00:03 +01:00

idle

…

ieee1394

ieee1394: add quirk fix for Freecom HDD

2008-12-14 01:13:13 +01:00

infiniband

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

2008-12-28 12:49:40 -08:00

input

Merge branch 'linus' into timers/hrtimers

2008-12-29 10:37:07 +01:00

isdn

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

2008-12-28 12:49:40 -08:00

leds

…

lguest

…

macintosh

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

mca

…

md

Merge branch 'linus' into tracing/hw-branch-tracing

2008-12-24 21:08:26 +01:00

media

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

2008-12-28 12:49:40 -08:00

memstick

…

message

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

2008-12-28 12:49:40 -08:00

mfd

…

misc

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

2008-12-28 12:49:40 -08:00

mmc

…

mtd

…

net

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

nubus

…

of

of/gpio: Implement of_gpio_count()

2008-12-21 14:21:14 +11:00

oprofile

…

parisc

…

parport

…

pci

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

pcmcia

pcmcia: blackfin: fix bug - add missing ; to MODULE macro

2008-12-15 16:27:06 -08:00

pnp

…

power

…

ps3

…

rapidio

rapidio: struct device - replace bus_id with dev_name(), dev_set_name()

2008-12-16 15:53:41 +11:00

regulator

…

rtc

rtc: rtc-isl1208: reject invalid dates

2008-12-23 15:58:21 -08:00

s390

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

2008-12-28 12:49:40 -08:00

sbus

…

scsi

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2008-12-28 12:54:07 -08:00

serial

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

sh

sh: maple: Do not pass SLAB_POISON to kmem_cache_create()

2008-12-16 16:40:32 +09:00

sn

…

spi

…

ssb

…

staging

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

2008-12-28 12:49:40 -08:00

tc

…

telephony

…

thermal

…

uio

…

usb

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

2008-12-28 12:49:40 -08:00

uwb

…

video

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2008-12-28 16:54:33 -08:00

virtio

…

w1

w1: fix slave selection on big-endian systems

2008-12-23 15:58:21 -08:00

watchdog

…

xen

xen: clean up asm/xen/hypervisor.h

2008-12-16 21:50:31 +01:00

zorro

…

Kconfig

…

Makefile

…