Benjamin Herrenschmidt 5ff6461133 drm: Fix mismerge of non-coherent DMA patch ...

The patch for supporting non coherent PCI DMA in the DRM was mismerged
causing the page protection to be updated for the wrong type of
mapping.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2008-04-26 17:48:17 +10:00

..

acorn/char

Fix default compose table initialization

2008-03-03 14:53:16 -08:00

acpi

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

2008-04-21 16:36:46 -07:00

amba

…

ata

pata_bf54x: decrease count first.

2008-04-25 01:26:28 -04:00

atm

drivers/atm: use time_before, time_before_eq, etc

2008-04-19 18:14:50 -07:00

auxdisplay

…

base

bus_remove_device: be more careful about incomplete initialization

2008-04-22 17:40:36 -07:00

block

xen: Add compatibility aliases for frontend drivers

2008-04-24 23:57:33 +02:00

bluetooth

hci_usb: remove code obfuscation

2008-04-19 18:17:26 -07:00

cdrom

cdrom: use kmalloced buffers instead of buffers on stack

2008-04-21 09:50:08 +02:00

char

drm: Fix mismerge of non-coherent DMA patch

2008-04-26 17:48:17 +10:00

clocksource

tclib: Fix compile warnings

2008-03-13 22:53:29 +01:00

connector

connector: convert to single-threaded workqueue

2008-03-23 21:51:12 -07:00

cpufreq

[CPUFREQ] fix section mismatch warnings

2008-03-05 14:45:31 -05:00

cpuidle

cpuidle: fix 100% C0 statistics regression

2008-03-26 00:58:19 -04:00

crypto

[CRYPTO] padlock-aes: Use generic setkey function

2008-04-21 10:19:34 +08:00

dca

…

dio

…

dma

DMA engine: typo fixes

2008-04-21 22:38:45 +00:00

edac

…

eisa

…

firewire

Convert asm/semaphore.h users to linux/semaphore.h

2008-04-18 22:22:54 -04:00

firmware

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

2008-04-21 15:49:58 -07:00

gpio

gpio/pca953x bugfix: mark as can_sleep

2008-03-10 18:01:19 -07:00

hid

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

2008-04-25 12:38:14 -07:00

hwmon

hwmon: (w83781d) Fix I/O resource conflict with PNP

2008-03-27 08:40:41 -04:00

i2c

i2c: Fix platform driver hotplug/coldplug

2008-04-22 22:16:49 +02:00

ide

ATA/IDE: fix platform driver hotplug/coldplug

2008-04-25 00:45:04 -04:00

ieee1394

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

2008-04-25 12:24:06 -07:00

infiniband

IB/ipath: Correct capitalization "IntX" -> "INTx"

2008-04-21 18:19:15 -07:00

input

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

2008-04-25 12:40:57 -07:00

isdn

Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

2008-04-21 15:56:19 -07:00

leds

leds: Add default-on trigger

2008-04-25 00:06:52 +01:00

lguest

drivers: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:16:32 -04:00

macintosh

mac-hid: fix build after lockdep annotation

2008-04-25 18:57:09 -07:00

mca

…

md

dm: remove md argument from specific_minor

2008-04-25 13:27:02 +01:00

media

v4l/dvb: add statics to avoid multiple definitions

2008-04-25 19:06:59 -07:00

memstick

memstick: convert struct class_device to struct device

2008-04-19 19:10:29 -07:00

message

SCSI: convert struct class_device to struct device

2008-04-19 19:10:33 -07:00

mfd

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

2008-04-24 08:36:11 -07:00

misc

[IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl

2008-04-22 15:08:55 -07:00

mmc

mmc: sdio_ops.c should #include "sdio_ops.h"

2008-04-18 20:05:33 +02:00

mtd

[MTD] m25p80: Add Support for ATMEL AT25DF641 64-Megabit SPI Flash

2008-04-25 09:14:23 +01:00

net

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

2008-04-25 12:52:16 -07:00

nubus

…

of

[POWERPC] drivers/of/of_i2c.c: Add MODULE_LICENSE

2008-04-24 20:58:01 +10:00

oprofile

d_path: Make get_dcookie() use a struct path argument

2008-02-14 21:17:08 -08:00

parisc

PCI: remove parisc consumer of the pci global_list

2008-04-20 21:47:01 -07:00

parport

avr32: don't offer PARPORT_PC

2008-04-19 20:40:10 -04:00

pci

intel-iommu.c: dma ops fix

2008-04-24 23:15:43 +02:00

pcmcia

[ARM] pxa: fix 0e623941be

2008-04-21 12:52:03 +01:00

pnp

pnpacpi: fix potential corruption on "pnpacpi: exceeded the max number of IRQ resources 2"

2008-04-23 12:22:13 -07:00

power

…

ps3

[POWERPC] PS3: Sys-manager Wake-on-LAN support

2008-04-01 20:43:08 +11:00

rapidio

docbook: fix rapidio source files

2008-03-03 10:47:13 -08:00

rtc

rtc: rtc-sh: Add support for periodic IRQs.

2008-04-18 09:50:01 -07:00

s390

Convert asm/semaphore.h users to linux/semaphore.h

2008-04-18 22:22:54 -04:00

sbus

…

scsi

Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block

2008-04-21 16:03:40 -07:00

serial

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

2008-04-25 12:52:16 -07:00

sh

maple: fix device detection

2008-02-26 14:12:09 +09:00

sn

ioc3.c: replace remaining __FUNCTION__ occurrences

2008-03-17 08:11:48 -04:00

spi

spi: spi_s3c24xx must initialize num_chipselect

2008-04-15 19:35:41 -07:00

ssb

ssb: Fix all-ones boardflags

2008-04-23 21:25:35 -04:00

tc

…

telephony

…

thermal

acpi thermal trip points increased to 12

2008-04-15 19:35:41 -07:00

uio

UIO: hold a reference to the device's owner while the device is open

2008-04-19 19:10:18 -07:00

usb

usb: don't update devnum for wusb devices

2008-04-24 21:16:59 -07:00

video

xen pvfb: Para-virtual framebuffer, keyboard and pointer driver

2008-04-24 23:57:33 +02:00

virtio

virtio: remove overzealous BUG_ON.

2008-04-07 13:14:22 -07:00

w1

ds1wm: report bus reset error

2008-03-04 16:35:12 -08:00

watchdog

Convert asm/semaphore.h users to linux/semaphore.h

2008-04-18 22:22:54 -04:00

xen

xen: add balloon driver

2008-04-24 23:57:33 +02:00

zorro

…

Kconfig

xen: add balloon driver

2008-04-24 23:57:33 +02:00

Makefile

…