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>
	Mon, 8 Oct 2012 00:26:50 +0000 (11:26 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 00:26:50 +0000 (11:26 +1100)
commit	c1e9fb26a9e62a66d270967f909fad84593dfdfe
tree	65e1924ac47fdbba7bd2e0084d12d0d87d00deb9	tree \| snapshot
parent	fe0b941433c5ae530c251ff037eb7964a6a31667	commit \| diff
parent	7ff34ad80b7080fafaac8efa9ef0061708eddd51	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

52 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/dm644x.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
include/linux/i2c/twl.h	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/asoc-ti-mcbsp.h	diff1 \|	diff2 \|	blob \| history
include/sound/ac97_codec.h	diff1 \|	diff2 \|	blob \| history
include/sound/ad1816a.h	diff1 \|	diff2 \|	blob \| history
include/sound/pcm.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/wm2000.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm5100.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/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/dm644x.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
include/linux/i2c/twl.h	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/asoc-ti-mcbsp.h	diff1 \|	diff2 \|	blob \| history
include/sound/ac97_codec.h	diff1 \|	diff2 \|	blob \| history
include/sound/ad1816a.h	diff1 \|	diff2 \|	blob \| history
include/sound/pcm.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/wm2000.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm5100.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/usb/endpoint.c	diff1 \|	diff2 \|	blob \| history