Chris Wilson 710f957846 Merge branch 'drm-intel-fixes' into drm-intel-next ...

Merge in the conflicting eDP fix.

Conflicts:
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

2011-02-22 16:09:03 +00: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

PM / Runtime: Don't enable interrupts while running in_interrupt

2011-01-25 20:50:07 +01:00

block

nbd: remove module-level ioctl mutex

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

bluetooth

Bluetooth: add Atheros BT AR9285 fw supported

2011-01-26 15:23:05 -02:00

cdrom

cdrom: support devices that have check_events but not media_changed

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

char

agp/intel: Experiment with a 855GM GWB bit

2011-02-22 15:52:41 +00:00

clk

…

clocksource

drivers/clocksource/tcb_clksrc.c: fix init sequence

2011-01-26 10:50:04 +10:00

connector

…

cpufreq

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

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

Merge branches 'fixes' and 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2011-01-21 13:34:39 -08:00

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

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-02-22 16:09:03 +00:00

hid

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

hwmon

hwmon: (lm85) extend to support EMC6D103 chips

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

i2c

…

ide

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

idle

fix a shutdown regression in intel_idle

2011-01-25 05:57:34 +10:00

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

leds: leds-pwm: return proper error if pwm_request failed

2011-01-26 10:49:58 +10:00

lguest

lguest: compile fixes

2011-01-20 21:37:29 +10:30

macintosh

powerpc/macintosh: Fix wrong test in fan_{read,write}_reg()

2011-01-21 14:08:34 +11:00

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

ARM: mmci: round down the bytes transferred on error

2011-01-31 10:53:37 +00:00

mtd

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

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

net

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

2011-02-18 14:15:05 -08:00

nfc

drivers/nfc/pn544.c: fix min_t warnings

2011-01-16 17:28:21 -08:00

nubus

…

of

dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()

2011-01-15 22:01:58 -07:00

oprofile

…

parisc

…

parport

parport: make lockdep happy with waitlist_lock

2011-01-26 10:49:59 +10:00

pci

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

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

pcmcia

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

platform

dell-laptop: Toggle the unsupported hardware killswitch

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

pnp

…

power

…

pps

pps: claim parallel port exclusively

2011-01-26 10:50:00 +10:00

ps3

…

rapidio

rapidio: fix new kernel-doc warnings

2011-01-22 20:32:37 -08:00

regulator

…

rtc

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

2011-02-18 14:20:46 -08: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

sh: update INTC to clear IRQ sense valid flag

2011-01-19 19:02:35 +09:00

sn

…

spi

spi/pxa2xx pci: fix the release - remove race

2011-02-15 13:25:36 -07: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

console: rename acquire/release_console_sem() to console_lock/unlock()

2011-01-26 10:50:06 +10:00

virtio

virtio: remove virtio-pci root device

2011-01-20 21:37:30 +10:30

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

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

2011-01-20 16:39:23 -08:00