iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/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
ARM/PCI: Remove ARM's duplicate definition of 'pcibios_max_latency'
2012-02-21 09:35:32 +00:00
configs
ARM: tegra: update defconfig
2012-03-07 14:38:49 -08:00
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
ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
2012-01-25 11:07:40 +00:00
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
Merge branch 'kirkwood/board' into next/boards
2012-02-27 16:23:21 +00:00
mach-clps711x
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-cns3xxx
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-davinci
Merge branch 'kirkwood/board' into next/boards
2012-02-27 16:23:21 +00:00
mach-dove
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-ebsa110
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
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
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-gemini
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-h720x
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-highbank
Linux 3.3-rc2
2012-02-07 15:05:20 -08:00
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
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
mach-iop13xx
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-iop32x
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-iop33x
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-ixp4xx
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-ixp23xx
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-ixp2000
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
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
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-l7200/include/mach
ARM: add an extra temp register to the low level debugging addruart macro
2011-09-26 10:11:25 -04:00
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
Linux 3.3-rc2
2012-02-07 15:05:20 -08:00
mach-mv78xx0
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-mxs
Merge branch 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/boards
2012-02-07 15:20:38 -08:00
mach-netx
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
mach-nomadik
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
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
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-picoxcell
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-pnx4008
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-prima2
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
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
Linux 3.3-rc2
2012-02-07 15:05:20 -08:00
mach-rpc
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
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
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-s3c2412
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-s3c2416
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-s3c2440
ARM: S3C2440: Fixed build error for s3c244x
2012-03-08 08:57:29 -08:00
mach-s3c2443
ARM: SAMSUNG: Fix missing api-change from subsys_interface change
2012-01-27 15:35:47 +09:00
mach-s5p64x0
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
2012-02-28 12:42:21 +00:00
mach-s5pc100
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
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
Linux 3.3-rc2
2012-02-07 15:05:20 -08:00
mach-shark
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
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
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
mach-spear6xx
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
mach-tegra
Merge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards
2012-03-04 21:22:33 +00:00
mach-u300
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
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
Merge branch 'amba' into for-armsoc
2012-01-26 19:59:44 +00:00
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
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-w90x900
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mach-zynq
ARM: big removal of now unused arch_idle()
2012-01-20 19:25:58 -05:00
mm
ARM: 7345/1: errata: update workaround for A9 erratum #743622
2012-02-27 11:22:08 +00:00
nwfpe
ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe.
2011-12-13 08:52:02 +00:00
oprofile
oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
2011-12-23 11:58:34 +01:00
plat-iop
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
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
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
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
ARM: orion: Fix USB phy for orion5x.
2012-02-09 16:16:35 -08:00
plat-pxa
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
2011-11-23 20:47:41 +00:00
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
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
plat-samsung
ARM: SAMSUNG: Fix memory size for hsotg
2012-03-01 13:19:47 +09:00
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
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
tools
ARM: Update mach-types
2011-12-23 22:58:10 +00:00
vfp
arm: remove several unnecessary module.h include instances
2011-10-31 19:30:48 -04:00
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
ARM: debug: arrange Kconfig options more logically
2012-01-20 10:50:46 +00:00
Makefile
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
2012-01-23 14:50:30 -08:00