git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 03:07:12 +0000 (13:07 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 03:07:12 +0000 (13:07 +1000)
commit	3d6b52458cc6c651b83d918bb714f2f2563260f8
tree	34c86cc8885d3bd081cf8a0dd824b4db0e6114f3	tree \| snapshot
parent	25a5e1b2e9934995938a2772ff5df8c32121ca3c	commit \| diff
parent	b7ef37d0e382298bcf7ba399ce67b044d9add23a	commit \| diff

Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c

51 files changed:

arch/arm/mach-davinci/davinci.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm355.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm365.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/include/mach/da8xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.h	diff1 \|	diff2 \|	blob \| history
drivers/dma/at_hdmac.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ep93xx_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mmp_tdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mxs-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/omap-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/sirf-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/tegra20-apb-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/i2c/twl.h	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/asoc-ti-mcbsp.h	diff1 \|	diff2 \|	blob \| history
sound/pci/oxygen/oxygen_lib.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-ac97.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-i2s.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/ab8500-codec.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm2000.c	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/imx-pcm-dma.c	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/imx-ssi.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/am3517evm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/mcbsp.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-abe-twl6040.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-mcbsp.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-mcpdm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/zoom2.c	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_msp_dai.c	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_msp_i2s.c	diff1 \|	diff2 \|	blob \| history
sound/usb/endpoint.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/mach-davinci/davinci.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm355.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/dm365.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/include/mach/da8xx.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/mcbsp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.h	diff1 \|	diff2 \|	blob \| history
drivers/dma/at_hdmac.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ep93xx_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/imx-sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mmp_tdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mxs-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/omap-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/sirf-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ste_dma40.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/tegra20-apb-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/i2c/twl.h	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/asoc-ti-mcbsp.h	diff1 \|	diff2 \|	blob \| history
sound/pci/oxygen/oxygen_lib.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-ac97.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-i2s.c	diff1 \|	diff2 \|	blob \| history
sound/soc/cirrus/ep93xx-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/ab8500-codec.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm2000.c	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/imx-pcm-dma.c	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/imx-ssi.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/am3517evm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/mcbsp.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-abe-twl6040.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-mcbsp.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-mcpdm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/omap-pcm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/omap/zoom2.c	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_msp_dai.c	diff1 \|	diff2 \|	blob \| history
sound/soc/ux500/ux500_msp_i2s.c	diff1 \|	diff2 \|	blob \| history
sound/usb/endpoint.c	diff1 \|	diff2 \|	blob \| history