AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
a754a87ce8
kernel_optimize_test/arch/arm
History
Arnd Bergmann a754a87ce8 Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
	arch/arm/mach-omap2/board-omap4panda.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: Olof Johansson <olof@lixom.net>
2012-03-27 15:18:19 -07:00
..
boot Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
common
configs
include/asm Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
kernel Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
lib
mach-at91 Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
mach-bcmring
mach-clps711x
mach-cns3xxx
mach-davinci
mach-dove
mach-ebsa110
mach-ep93xx Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-exynos Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
mach-footbridge
mach-gemini
mach-h720x
mach-highbank
mach-imx Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-ks8695
mach-l7200/include/mach
mach-lpc32xx Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards 2012-03-10 09:15:30 -08:00
mach-mmp Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards 2012-03-10 09:15:30 -08:00
mach-msm
mach-mv78xx0
mach-mxs
mach-netx
mach-nomadik
mach-omap1 Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards 2012-03-10 09:15:30 -08:00
mach-omap2 Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-orion5x
mach-picoxcell
mach-pnx4008
mach-prima2
mach-pxa Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
mach-realview
mach-rpc
mach-s3c64xx Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-s3c2410
mach-s3c2412
mach-s3c2416
mach-s3c2440
mach-s3c2443
mach-s5p64x0
mach-s5pc100
mach-s5pv210 Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards 2012-03-13 16:10:35 -07:00
mach-sa1100
mach-shark
mach-shmobile Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-spear3xx
mach-spear6xx
mach-tegra
mach-u300
mach-ux500 Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
mach-versatile
mach-vexpress Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
mach-vt8500
mach-w90x900
mach-zynq
mm
nwfpe
oprofile
plat-iop
plat-mxc Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
plat-nomadik
plat-omap Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
plat-orion
plat-pxa
plat-s3c24xx Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
plat-s5p
plat-samsung
plat-spear Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
plat-versatile
tools
vfp
Kconfig Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 2012-03-15 16:09:21 +00:00
Kconfig-nommu
Kconfig.debug
Makefile