Javier Martin 660cd0dd94 dmaengine: i.MX: Fix merge of cookie branch. ...

When merging DMA cookie changes a small chunk
of code was dropped. This broke imx-dma driver.

This patch adds this chunk again and fixes the problem.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

2012-03-26 11:31:32 +05:30

..

accessibility

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-01-18 15:51:48 -08:00

amba

…

ata

[libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list

2012-01-17 20:50:53 -05:00

atm

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

auxdisplay

…

base

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

2012-01-16 15:02:30 -08:00

bcma

bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume

2012-01-17 09:54:08 -05:00

block

nvme: fix merge error due to change of 'make_request_fn' fn type

2012-01-18 15:41:27 -08:00

bluetooth

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

cdrom

block: add and use scsi_blk_cmd_ioctl

2012-01-14 15:07:24 -08:00

char

tpm: fix (ACPI S3) suspend regression

2012-01-18 15:50:17 -08:00

clk

…

clocksource

…

connector

…

cpufreq

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

2012-01-11 18:53:33 -08:00

cpuidle

…

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-01-10 22:01:27 -08:00

dca

…

devfreq

…

dio

…

dma

dmaengine: i.MX: Fix merge of cookie branch.

2012-03-26 11:31:32 +05:30

edac

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

eisa

…

firewire

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

firmware

Merge commit '070680218379e15c1901f4bf21b98e3cbf12b527' into stable/for-linus-fixes-3.3

2012-01-12 11:53:55 -05:00

gpio

gpio: tps65910: Use correct offset for gpio initialization

2012-01-18 13:48:43 -07:00

gpu

nouveau: Support Optimus models for vga_switcheroo

2012-01-13 09:09:15 +00:00

hid

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

hv

…

hwmon

hwmon: (adm1031) Fix coding style issues

2012-01-16 22:51:48 +01:00

hwspinlock

…

i2c

Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33

2012-01-17 23:30:41 +00:00

ide

block: add and use scsi_blk_cmd_ioctl

2012-01-14 15:07:24 -08:00

idle

Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release

2012-01-18 01:15:54 -05:00

ieee802154

…

infiniband

Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2012-01-18 16:29:42 -08:00

input

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

2012-01-14 12:32:16 -08:00

iommu

…

isdn

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

2012-01-14 12:32:16 -08:00

leds

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

2012-01-14 12:32:16 -08:00

lguest

lguest: Make sure interrupt is allocated ok by lguest_setup_irq

2012-01-12 15:44:47 +10:30

macintosh

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

mca

…

md

Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block

2012-01-15 12:24:45 -08:00

media

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

memstick

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

message

…

mfd

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

2012-01-14 12:32:16 -08:00

misc

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

mmc

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

mtd

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

net

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

nfc

…

nubus

…

of

Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

2012-01-14 13:25:55 -08:00

oprofile

…

parisc

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

parport

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

2012-01-14 12:32:16 -08:00

pci

Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

2012-01-14 18:36:33 -08:00

pcmcia

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-01-14 13:05:21 -08:00

pinctrl

…

platform

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

pnp

…

power

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

pps

…

ps3

…

ptp

…

rapidio

…

regulator

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-01-13 20:43:32 -08:00

rtc

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-01-13 20:43:32 -08:00

s390

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

sbus

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2012-01-18 12:35:17 -08:00

sfi

…

sh

Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh

2012-01-11 23:29:20 -08:00

sn

…

spi

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

ssb

…

staging

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-15 12:49:56 -08:00

target

…

tc

…

telephony

…

thermal

…

tty

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

uio

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

usb

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

uwb

…

vhost

vhost-net: add module alias (v2.1)

2012-01-13 10:12:23 -08:00

video

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

virt

…

virtio

virtio: balloon: Add freeze, restore handlers to support S4

2012-01-12 15:44:47 +10:30

vlynq

…

w1

…

watchdog

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

xen

xen: using EXPORT_SYMBOL requires including export.h

2012-01-18 15:37:49 -08:00

zorro

…

Kconfig

…

Makefile

mmc: sdhci-pci: add platform data

2012-01-11 23:58:47 -05:00