Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 15:11:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1c75c42100
linux/arch/arm
History
Olof Johansson 1c75c42100 Merge branch 'socfpga/hw' into next/soc 
From Dinh Nguyen, this is a series of patches introducing support for
socfpga hardware (Altera Cyclone5). It also includes a cleanup that
moves some of the ARMv7 cache maintenance functions to a common location,
since three other platforms aready implemented it separately.

* socfpga/hw:
  arm: socfpga: Add SMP support for actual socfpga harware
  arm: Add v7_invalidate_l1 to cache-v7.S
  arm: socfpga: Add entries to enable make dtbs socfpga
  arm: socfpga: Add new device tree source for actual socfpga HW

Trivial conflict in arch/arm/mach-tegra/headsmp.S.

Signed-off-by: Olof Johansson <olof@lixom.net>
2013-02-11 19:37:51 -08:00
..
boot Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
common irqchip: Move ARM VIC to drivers/irqchip 2013-01-12 10:52:14 -06:00
configs mxs soc changes for 3.9 2013-02-09 18:27:28 -08:00
crypto
include imx soc changes for 3.9 2013-02-05 15:34:51 -08:00
kernel ARM: tegra: add Tegra114 SoC support 2013-02-05 13:10:39 -08:00
lib
mach-at91 Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
mach-bcm Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-bcm2835 ARM: bcm2835: SoC driver updates 2013-01-29 09:53:44 -08:00
mach-clps711x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cns3xxx Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-davinci DaVinci SoC changes for v3.9 2013-01-29 09:26:44 -08:00
mach-dove Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-ebsa110 ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-ep93xx Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-exynos Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-footbridge Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-gemini ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-h720x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-highbank Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-imx Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-integrator Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
mach-iop13xx Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-iop32x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-iop33x ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-ixp4xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-kirkwood mvebu drivers for v3.9 2013-02-04 22:56:53 -08:00
mach-ks8695 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-mmp Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-msm Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-mv78xx0 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-mvebu Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
mach-mxs mxs soc changes for 3.9 2013-02-09 18:27:28 -08:00
mach-netx Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-nomadik Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-omap1 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-omap2 OMAP PM related updates via Paul Walmsley <paul@pwsan.com>: 2013-02-05 14:05:11 -08:00
mach-orion5x Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-picoxcell Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-prima2 ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move 2013-02-04 21:53:14 -08:00
mach-pxa Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
mach-realview Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-rpc ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-s3c24xx Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-s3c64xx Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0 Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-s5pc100 Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-s5pv210 Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-sa1100 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-shark ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-shmobile Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-socfpga Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-spear3xx Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-spear6xx Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-spear13xx Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-sunxi Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-tegra Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-u300 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-ux500 Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-versatile Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-vexpress Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
mach-vt8500 Merge branch 'depends/cleanup' into next/soc 2013-01-27 23:03:34 -08:00
mach-w90x900 Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
mach-zynq Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mm arm: Add v7_invalidate_l1 to cache-v7.S 2013-02-11 19:37:24 -08:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
nwfpe
oprofile
plat-iop ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-omap ARM: arm-soc fixes for 3.8-rc 2013-01-08 18:53:56 -08:00
plat-orion mvebu drivers for v3.9 2013-02-04 22:56:53 -08:00
plat-pxa ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
plat-s3c24xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
plat-samsung Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup 2013-01-28 10:20:34 -07:00
plat-spear ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-versatile Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
tools
vfp ARM: 7627/1: Predicate preempt logic on PREEMP_COUNT not PREEMPT alone 2013-01-16 16:51:10 +00:00
xen Features: 2012-12-13 14:29:16 -08:00
Kconfig Merge branch 'tegra/t114' into next/soc 2013-02-09 17:53:02 -08:00
Kconfig-nommu
Kconfig.debug imx soc changes for 3.9 2013-02-05 15:34:51 -08:00
Makefile ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00