Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ...

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-02-22 20:05:19 +01:00

..

accessibility

…

acpi

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

amba

…

ata

Add support for VT6415 PCIE PATA IDE Host Controller

2009-02-17 16:56:31 -08:00

atm

fore200: fix oops on failed firmware load

2009-02-10 17:19:19 -08:00

auxdisplay

…

base

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

block

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

bluetooth

…

cdrom

…

char

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

clocksource

…

connector

…

cpufreq

…

cpuidle

…

crypto

…

dca

…

dio

…

dma

atmel-mci: fix initialization of dma slave data

2009-02-18 15:37:55 -08:00

edac

…

eisa

…

firewire

…

firmware

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

gpio

…

gpu

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

hid

HID: move tmff and zpff devices from ignore_list to blacklist

2009-02-17 13:25:01 +01:00

hwmon

lis3lv02d: add axes knowledge of HP Pavilion dv5 models

2009-02-18 15:37:54 -08:00

i2c

…

ide

…

idle

…

ieee1394

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

2009-02-06 08:48:16 -08:00

infiniband

…

input

…

isdn

drivers/isdn: introduce missing kfree

2009-02-08 17:00:49 -08:00

leds

…

lguest

…

macintosh

…

mca

…

md

block: fix bad definition of BIO_RW_SYNC

2009-02-18 10:32:00 +01:00

media

V4L/DVB (10626): ivtv: fix regression in get sliced vbi format

2009-02-17 09:43:09 -03:00

memstick

…

message

…

mfd

mfd: Fix sm501_register_gpio section mismatch

2009-02-17 09:48:05 +01:00

misc

Merge branch 'linus' into x86/apic

2009-02-13 09:44:22 +01:00

mmc

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

2009-02-18 17:55:15 -08:00

mtd

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

net

Merge branches 'x86/acpi', 'x86/apic', 'x86/cpudetect', 'x86/headers', 'x86/paravirt', 'x86/urgent' and 'x86/xen'; commit 'v2.6.29-rc5' into x86/core

2009-02-17 12:07:00 +01:00

nubus

…

of

…

oprofile

…

parisc

…

parport

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

pci

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

pcmcia

…

platform

fujitsu-laptop: Use RFKILL support bitmask from firmware

2009-02-21 21:59:55 -05:00

pnp

…

power

…

ps3

…

rapidio

…

regulator

…

rtc

rtc: t reaches -1, tested 0

2009-02-11 14:25:36 -08:00

s390

[S390] fix "mem=" handling in case of standby memory

2009-02-19 15:19:19 +01:00

sbus

…

scsi

[SCSI] qla2xxx: Update version number to 8.03.00-k3.

2009-02-10 11:15:20 -05:00

serial

8250: fix boot hang with serial console when using with Serial Over Lan port

2009-02-20 17:57:50 -08:00

sh

…

sn

…

spi

spi-gpio: sanitize MISO bitvalue

2009-02-18 15:37:56 -08:00

ssb

…

staging

Staging: panel: fix lcd panel driver build failure

2009-02-09 11:26:18 -08:00

tc

…

telephony

…

thermal

…

uio

…

usb

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

2009-02-19 09:52:12 -08:00

uwb

…

video

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

virtio

…

w1

w1: w1 temp calculation overflow fix

2009-02-11 14:25:37 -08:00

watchdog

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

xen

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

zorro

…

Kconfig

…

Makefile

…