Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
56b690481c
linux/arch/arm
History
Arnd Bergmann 56b690481c Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 
These patches get us closer to adding multiplatform support on
the Exynos platform, they are part of a longer series of
patches.  This would get all the simple stuff out of the
way, and I don't think there is a big risk of introducing
regressions with these.

A lot of the other patches have already been merged into
subsystem trees. After this series in in arm-soc, what is
left comes down to

* The ASoC conversion to dmaengine won't make it unless someone
  who knows that code better steps up to do it right away. This
  means that we won't have audio in a 3.10 multiplatform kernel
  on Exynos, but it will still work for users that don't enable
  multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
  on top   of other changesets we pulled in from your trees, so I
  would not make them part of the next/multiplatform branch. We can
  apply them on top of the next/drivers branch once they are
  tested successfully.

* A trivial patch is needed in the end to actually make
  CONFIG_ARCH_EXYNOS visible in multiplatform configurations.
  We will do that as a separate patch once everything else is
  there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-04-19 14:33:09 +02:00
..
boot Merge branch 'tegra/soc' into next/multiplatform 2013-04-09 16:54:27 +02:00
common ARM: GIC: fix GIC cpumask initialization 2013-02-08 10:17:22 +00:00
configs Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 2013-04-19 14:33:09 +02:00
crypto
include Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 2013-04-19 14:33:09 +02:00
kernel Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup 2013-04-01 16:29:56 +08:00
kvm ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot 2013-02-25 11:48:41 +02:00
lib ARM: 7670/1: fix the memset fix 2013-03-12 12:18:47 +00:00
mach-at91 arm-soc: bug fixes for 3.9-rc3 2013-03-18 08:17:14 -07:00
mach-bcm
mach-bcm2835 ARM: bcm2835: convert to multi-platform 2013-03-12 22:30:45 -06:00
mach-clps711x
mach-cns3xxx ARM: cns3xxx: initial DT support 2013-03-14 22:30:21 +01:00
mach-davinci ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830 2013-03-12 17:10:46 +05:30
mach-dove arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-ebsa110
mach-ep93xx
mach-exynos Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 2013-04-19 14:33:09 +02:00
mach-footbridge ARM: fix CONFIG_VIRT_TO_BUS handling 2013-03-18 13:49:57 +00:00
mach-gemini
mach-h720x
mach-highbank ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-imx ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-integrator Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop13xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
mach-kirkwood ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels 2013-03-08 21:34:16 +00:00
mach-ks8695 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-l7200/include/mach
mach-lpc32xx
mach-mmp ARM: mmp: add platform_device head file in gplugd 2013-03-15 16:27:53 +08:00
mach-msm ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-mv78xx0 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-mvebu arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-mxs ARM: mxs: enable multiplatform build 2013-04-04 21:15:58 +08:00
mach-netx ARM: 7642/1: netx: bump IRQ offset to 64 2013-03-03 22:54:11 +00:00
mach-nomadik ARM: nomadik: hide MACH_NOMADIK_8815NHK in Kconfig 2013-03-19 22:01:25 +01:00
mach-omap1 ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h 2013-03-04 11:12:16 -08:00
mach-omap2 ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-orion5x Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-picoxcell
mach-prima2 ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-pxa ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
mach-realview ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-rpc
mach-s3c24xx ARM: exynos: move debug-macro.S to include/debug/ 2013-04-19 13:51:21 +02:00
mach-s3c64xx ARM: exynos: move debug-macro.S to include/debug/ 2013-04-19 13:51:21 +02:00
mach-s5p64x0 ARM: exynos: move debug-macro.S to include/debug/ 2013-04-19 13:51:21 +02:00
mach-s5pc100 mmc: sdhci-s3c: remove platform dependencies 2013-04-19 13:51:23 +02:00
mach-s5pv210 mmc: sdhci-s3c: remove platform dependencies 2013-04-19 13:51:23 +02:00
mach-sa1100 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-shark
mach-shmobile ARM: shmobile: marzen: Include mmc/host.h 2013-03-08 16:29:23 +01:00
mach-socfpga Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-spear ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-sunxi Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-tegra ARM: tegra: build assembly files with -march=armv7-a 2013-04-09 22:04:00 +02:00
mach-u300 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-ux500 ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-versatile Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-vexpress ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mach-virt ARM: mach-virt: fixup machine descriptor after removal of sys_timer 2013-02-11 10:39:30 -08:00
mach-vt8500 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-w90x900 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-zynq ARM: Push selects for TWD/SCU into machine entries 2013-04-09 21:30:24 +02:00
mm Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2013-03-15 17:35:03 -07:00
net ARM:net: an issue for k which is u32, never < 0 2013-03-12 11:33:05 -04:00
nwfpe
oprofile
plat-iop
plat-omap arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
plat-orion arm: plat-orion: fix address decoding when > 4GB is used 2013-03-08 22:07:19 +00:00
plat-pxa
plat-samsung ARM: exynos: enable multiplatform support 2013-04-19 13:51:26 +02:00
plat-versatile Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer 2013-02-11 19:03:52 +00:00
tools
vfp ARM: Fix broken commit 0cc41e4a21 corrupting kernel messages 2013-03-01 21:09:59 +00:00
xen xen: implement updated XENMEM_add_to_physmap_range ABI 2013-02-19 22:01:55 -05:00
Kconfig Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 2013-04-19 14:33:09 +02:00
Kconfig-nommu
Kconfig.debug Merge branch 'samsung/exynos-multiplatform' into next/multiplatform 2013-04-19 14:33:09 +02:00
Makefile ARM: spear: move all files to mach-spear 2013-03-12 17:39:47 +01:00