From: Olof Johansson Date: Tue, 28 May 2013 03:10:48 +0000 (-0700) Subject: Merge branch 'next/drivers' into for-next X-Git-Tag: next-20130607~15^2~20 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cf7ab1f2d5772ff2f46bcf11bfad18c8a43c0af5;p=karo-tx-linux.git Merge branch 'next/drivers' into for-next * next/drivers: (36 commits) ARM: ux500: Register Cryp and Hash platform drivers on Snowball crypto: ux500/[cryp|hash] - Show successful start-up in the bootlog ARM: ux500: Stop passing Cryp DMA channel config information though pdata crypto: ux500/cryp - Set DMA configuration though dma_slave_config() crypto: ux500/cryp - Prepare clock before enabling it ARM: ux500: Stop passing Hash DMA channel config information though pdata crypto: ux500/hash - Set DMA configuration though dma_slave_config() crypto: ux500/hash - Prepare clock before enabling it ARM: ux500: Remove unnecessary attributes from DMA channel request pdata dmaengine: ste_dma40: Correct copy/paste error ARM: ux500: Remove DMA address look-up table dmaengine: ste_dma40: Remove redundant address fetching function dmaengine: ste_dma40: Only use addresses passed as configuration information ARM: ux500: Stop passing UART's platform data for Device Tree boots dmaengine: ste_dma40: Don't configure runtime configurable setup during allocate dmaengine: ste_dma40: Remove unnecessary call to d40_phy_cfg() dmaengine: ste_dma40: Separate Logical Global Interrupt Mask (GIM) unmasking ARM: ux500: Pass remnant platform data though to DMA40 driver dmaengine: ste_dma40: Supply full Device Tree parsing support dmaengine: ste_dma40: Allow driver to be probe()able when DT is enabled ... Signed-off-by: Olof Johansson --- cf7ab1f2d5772ff2f46bcf11bfad18c8a43c0af5 diff --cc arch/arm/arm-soc-for-next-contents.txt index 4702a47d7b34,000000000000..fcb414fc2e6d mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,14 -1,0 +1,18 @@@ +for-next contents for 3.11: +Format is a little different from before in an attempt to make it easier to read: + + + + + <...> + <...> + ++next/drivers ++ ux500/dma40 ++ git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc ++ +next/mailbox: + mailbox/subsystem + git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox + +