This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

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

..

cpaccess.c

arm: common: cpaccess.c: fixup

2013-02-20 02:49:17 -08:00

dmabounce.c

ARM: dmabounce: get rid of dma_needs_bounce global function

2011-07-04 08:39:55 +01:00

fiq_debugger_ringbuf.h

ARM: Add generic fiq serial debugger

2012-04-09 13:57:51 -07:00

fiq_debugger.c

ARM: fiq_debugger: fix multiple consoles and make it a preferred console

2012-04-09 13:58:03 -07:00

fiq_glue_setup.c

ARM: Add fiq_glue

2012-04-09 13:57:51 -07:00

fiq_glue.S

ARM: Add fiq_glue

2012-04-09 13:57:51 -07:00

gic.c

arm: gic: add irqdomain support backport fixup

2013-02-20 02:49:27 -08:00

icst.c

Update broken web addresses in arch directory.

2010-10-18 11:03:21 +02:00

it8152.c

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-03-23 14:02:12 -07:00

Kconfig

Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4

2013-02-25 11:25:46 -08:00

locomo.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

Makefile

Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4

2013-02-25 11:25:46 -08:00

sa1111.c

ARM: sa1111: use dev_err() rather than printk()

2012-03-24 11:30:12 +00:00

scoop.c

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

sharpsl_param.c

[ARM] 4733/1: export sharpsl_param

2008-10-03 10:18:35 +01:00

timer-sp.c

ARM: timer-sp: add sched_clock support

2012-02-09 22:42:55 -06:00

uengine.c

arm: uengine.c: remove C99 comments

2010-09-23 13:20:06 +02:00

via82c505.c

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

vic.c

ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler

2012-04-10 09:27:42 +01:00