xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e3a66aa33a8f06924f67770e15c22a5c52df314e
android_kernel_xiaomi_sm8450/arch/arm
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
boot
ARM: dtb: move all dtb targets to common Makefile
2012-09-20 22:58:17 -07:00
common
ARM: dma-mapping: add support for dma_get_sgtable()
2012-07-30 12:25:47 +02:00
configs
Merge branch 'next/soc' into next/multiplatform
2012-09-20 21:27:41 -07:00
include
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
kernel
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
lib
ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop
2012-09-09 17:28:48 +01:00
mach-at91
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-bcm2835
ARM: dtb: move all dtb targets to common Makefile
2012-09-20 22:58:17 -07:00
mach-bcmring
Merge tag 'arm-perf-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/cleanup
2012-09-04 22:12:41 -07:00
mach-clps711x
ARM: clps711x: Remove the setting of the time
2012-07-17 22:24:30 +02:00
mach-cns3xxx
…
mach-davinci
ARM: davinci: move platform_data definitions
2012-09-14 11:16:54 +02:00
mach-dove
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-ebsa110
…
mach-ep93xx
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-exynos
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-footbridge
ARM: footbridge: use fixed PCI i/o mapping
2012-07-26 09:09:59 -05:00
mach-gemini
ARM: gemini: fix the gemini build
2012-09-04 22:17:34 -07:00
mach-h720x
…
mach-highbank
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-imx
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-integrator
Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci
2012-09-04 15:01:37 +02:00
mach-iop13xx
ARM: iop13xx: use fixed PCI i/o mapping
2012-07-26 09:10:02 -05:00
mach-iop32x
ARM: iop3xx: use fixed PCI i/o mapping
2012-07-26 09:10:04 -05:00
mach-iop33x
ARM: iop3xx: use fixed PCI i/o mapping
2012-07-26 09:10:04 -05:00
mach-ixp4xx
ARM: make mach/gpio.h headers optional
2012-09-14 09:21:59 -05:00
mach-kirkwood
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-ks8695
ARM: ks8695: convert to generic time and clocksource
2012-09-05 08:49:22 +02:00
mach-l7200/include/mach
…
mach-lpc32xx
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-mmp
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-msm
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-mv78xx0
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-mvebu
ARM: initial multiplatform support
2012-09-14 09:22:06 -05:00
mach-mxs
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-netx
ARM: netx: move platform_data definitions
2012-09-14 11:17:36 +02:00
mach-nomadik
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-omap1
ARM: OMAP1: Move irda.h from plat to mach
2012-09-20 15:03:58 -07:00
mach-omap2
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-orion5x
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-picoxcell
ARM: initial multiplatform support
2012-09-14 09:22:06 -05:00
mach-prima2
ARM: dtb: move all dtb targets to common Makefile
2012-09-20 22:58:17 -07:00
mach-pxa
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-realview
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-rpc
ARM: fiq: change FIQ_START to a variable
2012-07-01 21:59:19 +08:00
mach-s3c24xx
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-s3c64xx
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-s3c2410
…
mach-s3c2412
…
mach-s3c2440
…
mach-s5p64x0
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-s5pc100
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-s5pv210
ARM: samsung: move platform_data definitions
2012-09-19 17:42:18 +02:00
mach-sa1100
ARM: sa1100: move platform_data definitions
2012-09-14 11:18:57 +02:00
mach-shark
ARM: shark: use fixed PCI i/o mapping
2012-07-26 09:09:58 -05:00
mach-shmobile
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-socfpga
ARM: initial multiplatform support
2012-09-14 09:22:06 -05:00
mach-spear3xx
ARM: move all dtb targets out of Makefile.boot
2012-09-14 09:22:04 -05:00
mach-spear6xx
ARM: move all dtb targets out of Makefile.boot
2012-09-14 09:22:04 -05:00
mach-spear13xx
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-tegra
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-u300
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-ux500
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-versatile
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
mach-vexpress
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
mach-vt8500
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
mach-w90x900
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
mach-zynq
…
mm
Merge branch 'next/dt' into next/multiplatform
2012-09-20 21:16:43 -07:00
net
ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support
2012-06-14 15:12:13 +01:00
nwfpe
…
oprofile
ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration
2012-07-09 17:41:10 +01:00
plat-iop
Merge tag 'arm-perf-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/cleanup
2012-09-04 22:12:41 -07:00
plat-mxc
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
plat-nomadik
ARM: nomadik: move platform_data definitions
2012-09-14 11:19:00 +02:00
plat-omap
Merge branch 'next/soc' into next/multiplatform
2012-09-20 21:27:41 -07:00
plat-orion
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
plat-pxa
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
plat-s3c24xx
ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
2012-08-08 09:04:51 +09:00
plat-samsung
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
plat-spear
Merge branch 'multiplatform/platform-data' into next/multiplatform
2012-09-22 01:07:21 -07:00
plat-versatile
Merge branch 'multiplatform/smp_ops' into next/multiplatform
2012-09-22 00:16:04 -07:00
tools
ARM: mach-pnx4008: Remove architecture
2012-08-26 16:30:37 +02:00
vfp
ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled
2012-08-11 09:15:57 +01:00
Kconfig
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
Kconfig-nommu
…
Kconfig.debug
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00
Makefile
Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform
2012-09-20 22:54:07 -07:00