TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
84d1c1a3a30365d42a79c4c598d29f9a3242e045
ubports_kernel_google_msm/arch/arm
History
Stephen Boyd 84d1c1a3a3 Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4 
Fix NR_IPI to be 7 instead of 6 because both googly and core add
an IPI.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/include/asm/hardware/cache-l2x0.h
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
	include/linux/wakelock.h
	kernel/power/Kconfig
	kernel/power/Makefile
	kernel/power/main.c
	kernel/power/power.h
2013-02-25 11:25:46 -08:00
..
boot
Merge commit 'v3.4-rc6' into android-3.4
2012-05-07 18:20:34 -07:00
common
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
2013-02-25 11:25:46 -08:00
configs
Merge branch 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-04-27 09:40:06 -07:00
include/asm
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
2013-02-25 11:25:46 -08:00
kernel
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
2013-02-25 11:25:46 -08:00
lib
arm: delay: annotate delay constant as unsigned long
2013-02-20 01:32:29 -08:00
mach-at91
ARM: at91: fix at91sam9261ek Ethernet dm9000 irq
2012-04-16 11:08:26 +02:00
mach-bcmring
ARM: bcmring: fix UART declarations
2012-04-18 21:21:45 -07:00
mach-clps711x
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-cns3xxx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-davinci
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
mach-dove
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-ebsa110
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-ep93xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-exynos
ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
2012-05-13 08:31:53 +09:00
mach-footbridge
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-gemini
…
mach-h720x
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-highbank
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-imx
ARM: imx: Fix imx5 idle logic bug
2012-04-18 11:52:24 +02:00
mach-integrator
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-iop13xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-iop32x
…
mach-iop33x
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-ixp4xx
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-ixp23xx
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-ixp2000
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-kirkwood
ARM: kirkwood: add missing kexec.h include
2012-05-08 18:43:25 +00:00
mach-ks8695
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-l7200/include/mach
…
mach-lpc32xx
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 21:30:28 -07:00
mach-mmp
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-msm
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
2013-02-25 11:25:46 -08:00
mach-mv78xx0
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-mxs
Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6
2012-03-30 17:31:56 -07:00
mach-netx
ARM: __io abuse cleanup
2012-03-13 21:25:21 -05:00
mach-nomadik
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-omap1
ARM: OMAP1: Amstrad Delta: Fix wrong IRQ base in FIQ handler
2012-05-04 09:53:09 -07:00
mach-omap2
ARM: OMAP: igep0020: fix smsc911x dummy regulator id
2012-05-09 08:12:05 -07:00
mach-orion5x
ARM: orion5x: Fix GPIO enable bits for MPP9
2012-05-08 18:57:21 +00:00
mach-picoxcell
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-pnx4008
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-prima2
ARM: PRIMA2: fix irq domain size and IRQ mask of internal interrupt controller
2012-05-16 21:52:13 -07:00
mach-pxa
ARM: PXA2xx: MFP: fix potential direction bug
2012-04-27 11:14:06 +08:00
mach-realview
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-rpc
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s3c24xx
ARM: S3C24XX: Fix build warning for S3C2410_PM
2012-04-24 13:49:59 -07:00
mach-s3c64xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s3c2410
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s3c2412
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s3c2440
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s5p64x0
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s5pc100
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s5pv210
ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability
2012-04-24 17:28:12 -07:00
mach-sa1100
arm/sa1100: fix sa1100-rtc memory resource
2012-04-27 11:02:14 +08:00
mach-shark
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-shmobile
ARM / mach-shmobile: Invalidate caches when booting secondary cores
2012-05-12 22:13:52 +02:00
mach-spear3xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-spear6xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-tegra
ARM: tegra: Fix flow controller accesses
2012-05-14 10:22:01 -06:00
mach-u300
ARM: u300: bump all IRQ numbers by one
2012-04-20 09:52:58 +02:00
mach-ux500
arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
2012-04-25 21:26:34 -07:00
mach-versatile
ARM: versatile: fix build failure in pci.c
2012-04-02 22:03:35 -07:00
mach-vexpress
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-vt8500
…
mach-w90x900
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-zynq
…
mm
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
2013-02-25 11:25:46 -08:00
net
ARM: 7259/3: net: JIT compiler for packet filters
2012-03-24 09:38:56 +00:00
nwfpe
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
oprofile
arm: perf_event: Add support for MSM chips
2013-02-20 02:44:08 -08:00
perfmon
arm: perform: update license
2013-02-20 02:50:14 -08:00
plat-iop
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
2012-03-28 15:58:21 -07:00
plat-mxc
ARM: 3ds_debugboard: Fix smsc911x driver probe
2012-04-02 11:15:15 +02:00
plat-nomadik
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
plat-omap
ARM: OMAP: fix DMA vs memory ordering
2012-04-23 16:54:21 +01:00
plat-orion
ARM: orion: wdt: use resource vice direct access
2012-03-16 04:28:41 +00:00
plat-pxa
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
plat-s3c24xx
ARM: fix builds due to missing <asm/system_misc.h> includes
2012-03-30 15:44:40 -07:00
plat-s5p
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
2012-03-20 10:07:48 +00:00
plat-samsung
ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers
2012-04-20 17:25:46 -07:00
plat-spear
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-03-29 23:17:44 -07:00
plat-versatile
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
tools
…
vfp
arm: vfp: vfpmodule.c: Make vfp suspend/resume functions non-static
2013-02-20 02:50:13 -08:00
Kconfig
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
2013-02-25 11:25:46 -08:00
Kconfig-nommu
…
Kconfig.debug
ARM: allow the kernel text section to be made read-only
2013-02-20 02:49:03 -08:00
Makefile
KSAPI: Performance monitoring tool for Snapdragon linux
2013-02-20 01:32:08 -08:00