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

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.

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

..

am35x.c

usb: musb: fix compilation breakage introduced by de47725

2011-11-14 11:51:32 -08:00

blackfin.c

usb: musb: blackfin: include prefetch head file

2011-08-12 11:52:51 +03:00

blackfin.h

usb: musb: drop a gigantic amount of ifdeferry

2011-07-01 14:31:10 -07:00

cppi_dma.c

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

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

cppi_dma.h

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

da8xx.c

usb: musb: fix compilation breakage introduced by de47725

2011-11-14 11:51:32 -08:00

davinci.c

ARM: gpio: davinci: convert drivers to use asm/gpio.h rather than mach/gpio.h

2011-08-08 14:27:55 +01:00

davinci.h

…

Kconfig

usb: musb: cleanup kconfig

2011-12-20 14:01:38 +02:00

Makefile

usb: musb: use a Kconfig choice to pick the right DMA method

2011-12-12 11:51:41 +02:00

musb_core.c

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

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

musb_core.h

usb: musb: fix pm_runtime calls while atomic

2011-12-12 11:51:54 +02:00

musb_debug.h

usb: musb: remove extern qualifier from musb_debug.h header

2011-12-21 13:21:02 +02:00

musb_debugfs.c

usb: musb: headers cleanup

2011-12-12 11:51:52 +02:00

musb_dma.h

usb: musb: introduce api for dma code to check compatibility with usb request

2011-02-01 10:41:30 +02:00

musb_gadget_ep0.c

usb: musb: headers cleanup

2011-12-12 11:51:52 +02:00

musb_gadget.c

Merge branch 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2011-12-13 09:37:40 -08:00

musb_gadget.h

usb: musb: gadget: do not poke with gadget's list_head

2011-02-17 21:11:46 +02:00

musb_host.c

usb: musb: fix reset issue with full speed device

2011-12-14 09:32:51 +02:00

musb_host.h

usb: musb: drop a gigantic amount of ifdeferry

2011-07-01 14:31:10 -07:00

musb_io.h

usb: musb: allow building USB_MUSB_TUSB6010 as a module

2011-12-12 11:51:42 +02:00

musb_regs.h

usb: musb: tusb6010: fix compilation

2011-08-12 11:52:50 +03:00

musb_virthub.c

usb: musb: drop a gigantic amount of ifdeferry

2011-07-01 14:31:10 -07:00

musbhsdma.c

USB: irq: Remove IRQF_DISABLED

2011-09-18 01:39:36 -07:00

musbhsdma.h

Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus

2011-02-16 11:32:38 -08:00

omap2430.c

musb: omap2430: avoid pm_runtime_disable()

2011-12-20 13:55:21 +02:00

omap2430.h

USB: musb: get rid of omap_readl/writel

2010-03-02 14:54:38 -08:00

tusb6010_omap.c

usb: musb: tusb6010: fix compilation

2011-08-12 11:52:50 +03:00

tusb6010.c

usb: musb: allow building USB_MUSB_TUSB6010 as a module

2011-12-12 11:51:42 +02:00

tusb6010.h

USB: musb: Remove my email address from few musb related drivers

2009-04-23 14:15:27 -07:00

ux500_dma.c

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

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

ux500.c

usb: musb: ux500: copy dma mask from platform device to musb device

2011-04-13 11:50:57 +03:00