]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sound/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 01:59:29 +0000 (11:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 01:59:29 +0000 (11:59 +1000)
commitdf0d85c781b9e333e6aa4f76b530e95ad346a1af
treed9c2bd502df038be3c67b0a9ed041f50d8a4704f
parentcc5ce138f12c5c3a827b2dc0189b29f24f6912ba
parentb7ef37d0e382298bcf7ba399ce67b044d9add23a
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
drivers/dma/at_hdmac.c
drivers/dma/mmp_tdma.c
drivers/dma/mxs-dma.c
drivers/dma/pl330.c
drivers/dma/sirf-dma.c
drivers/dma/ste_dma40.c
drivers/dma/tegra20-apb-dma.c