Thomas Gleixner 7acdbb3f35 Merge branch 'linus' into x86/platform ...

Reason: Import mainline device tree changes on which further patches
        depend on or conflict.

Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2011-02-23 09:21:41 +01:00

..

accessibility

…

acpi

Merge branch 'iomem' into release

2011-02-15 15:25:48 -05:00

amba

…

ata

libata: set queue DMA alignment to sector size for ATAPI too

2011-01-28 03:16:20 -05:00

atm

ATM, Solos PCI ADSL2+: Don't deref NULL pointer if net_ratelimit() and alloc_skb() interact badly.

2011-02-13 16:55:46 -08:00

auxdisplay

…

base

…

block

nbd: remove module-level ioctl mutex

2011-02-11 16:12:20 -08:00

bluetooth

…

cdrom

cdrom: support devices that have check_events but not media_changed

2011-02-09 14:22:37 +01:00

char

Revert "tpm_tis: Use timeouts returned from TPM"

2011-02-20 10:03:12 -08:00

clk

…

clocksource

…

connector

…

cpufreq

…

cpuidle

…

crypto

…

dca

…

dio

…

dma

Merge branch 'imx' into dmaengine-fixes

2011-02-14 02:40:46 -08:00

edac

amd64_edac: Fix DIMMs per DCTs output

2011-02-10 14:41:49 +01:00

eisa

…

firewire

…

firmware

x86, dmi, debug: Log board name (when present) in dmesg/oops output

2011-02-15 04:20:57 +01:00

gpio

drivers/gpio/pca953x.c: add a mutex to fix race condition

2011-02-11 16:12:20 -08:00

gpu

drm/i915: Do not handle backlight combination mode specially

2011-02-21 15:25:43 -08:00

hid

…

hwmon

hwmon: (lm85) extend to support EMC6D103 chips

2011-02-18 17:43:36 -08:00

i2c

…

ide

…

idle

…

ieee802154

…

infiniband

Merge branches 'nes' and 'qib' into for-next

2011-02-17 14:04:59 -08:00

input

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

2011-02-15 09:40:27 -08:00

isdn

isdn: hisax: Use l2headersize() instead of dup (and buggy) func.

2011-02-15 12:18:09 -08:00

leds

…

lguest

…

macintosh

…

mca

…

md

FIX: md: process hangs at wait_barrier after 0->10 takeover

2011-02-08 11:49:02 +11:00

media

Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-02-02 17:52:19 -08:00

memstick

workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'

2011-02-16 17:48:59 +01:00

message

[SCSI] mptfusion: Bump version 03.04.18

2011-02-12 12:51:21 -06:00

mfd

…

misc

workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'

2011-02-16 17:48:59 +01:00

mmc

Merge commit 'v2.6.38-rc3' into devicetree/next

2011-02-04 11:46:43 -07:00

mtd

workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'

2011-02-16 17:48:59 +01:00

net

Merge branch 'linus' into x86/platform

2011-02-23 09:21:41 +01:00

nfc

…

nubus

…

of

of/pci: move of_irq_map_pci() into generic code

2011-02-04 11:46:50 -07:00

oprofile

…

parisc

…

parport

…

pci

pci: use security_capable() when checking capablities during config space read

2011-02-15 19:06:31 +11:00

pcmcia

…

platform

dell-laptop: Toggle the unsupported hardware killswitch

2011-02-21 17:06:21 -05:00

pnp

…

power

…

pps

…

ps3

…

rapidio

…

regulator

…

rtc

Merge branch 'linus' into x86/platform

2011-02-23 09:21:41 +01:00

s390

[S390] dasd: correct device table

2011-02-17 13:13:58 +01:00

sbus

…

scsi

[SCSI] qla2xxx: Return DID_NO_CONNECT when FC device is lost.

2011-02-15 11:12:17 -06:00

sfi

…

sh

…

sn

…

spi

Merge branch 'linus' into x86/platform

2011-02-23 09:21:41 +01:00

ssb

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

2011-02-08 12:03:54 -08:00

staging

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-02-10 12:19:23 -08:00

target

[SCSI] target: fix use after free detected by SLUB poison

2011-02-12 12:32:41 -06:00

tc

…

telephony

…

thermal

…

tty

Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2011-02-18 12:36:06 -08:00

uio

…

usb

USB: cdc-acm: Adding second ACM channel support for Nokia N8

2011-02-04 12:38:14 -08:00

uwb

…

vhost

vhost: rcu annotation fixup

2011-02-01 16:48:46 +02:00

video

…

virtio

…

vlynq

…

w1

drivers/w1/masters/omap_hdq.c: add missing clk_put

2011-02-11 16:12:20 -08:00

watchdog

m68knommu: Rename m548x_wdt.c to m54xx_wdt.c

2011-02-08 15:07:45 +10:00

xen

xen: suspend and resume system devices when running PVHVM

2011-02-17 10:31:20 +00:00

zorro

…

Kconfig

…

Makefile

…