UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/arm/mach-msm
History
Olof Johansson a5f17d1f4c Linux 3.3-rc2 
.. several days delayed. No reason, I just didn't think of it.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc
 DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7
 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS
 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6
 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA
 jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g=
 =kUzV
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
 		2012-02-07 15:05:20 -08:00
..
include/mach ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
Kconfig Cleanups on various subarchitectures 2012-01-09 14:21:03 -08:00
Makefile ARM: msm: fix compilation flags for MSM_SCM 2011-11-08 08:58:28 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
acpuclock-arm11.c Fix common misspellings 2011-03-31 11:26:23 -03:00
acpuclock.h arm: msm: add cpu frequency controls 2010-05-12 09:14:20 -07:00
board-halibut.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-mahimahi.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm7x27.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-msm7x30.c msm: boards: Fix fallout from removal of machine_desc in fixup 2011-11-01 16:10:33 -07:00
board-msm8x60.c ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:00 +00:00
board-msm8960.c ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:00 +00:00
board-qsd8x50.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-sapphire.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
board-trout-gpio.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
board-trout-mmc.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-trout-panel.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
board-trout.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-trout.h Add GPIO support for HTC Dream. 2010-06-15 13:19:43 -07:00
clock-7x30.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock-debug.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.c msm: clock: Remove references to clk_ops_pcom 2011-02-28 12:40:05 -08:00
clock-pcom.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
clock.c PM QoS: Move and rename the implementation files 2011-08-25 15:35:03 +02:00
clock.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-iommu.c iommu/msm: Fix compile error in mach-msm/devices-iommu.c 2011-12-06 11:17:34 +01:00
devices-msm7x00.c msm: mmc: Remove "pio_irq" resource 2011-10-26 15:43:37 -04:00
devices-msm7x30.c msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
devices-msm8960.c msm: serial: Add MSM8960 serial support 2011-01-28 12:27:21 -08:00
devices-qsd8x50.c msm: mmc: Remove "pio_irq" resource 2011-10-26 15:43:37 -04:00
devices.h msm: clock: Migrate to clkdev 2011-02-28 12:40:17 -08:00
dma.c msm: dma: add completion.h header 2010-06-07 16:16:33 -07:00
gpiomux-8x50.c msm: 8x50: Add initial support for SDCC 2011-01-21 16:58:02 -08:00
gpiomux-8x60.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v1.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v1.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v2.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux-v2.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.c msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.h msm: gpiomux: Move public API to public header 2011-08-01 04:58:00 -07:00
headsmp.S ARM: msm: Add missing ENDPROC to headsmp.S 2012-01-16 08:36:02 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
idle.c ARM: mach-msm: hook special idle handlers to arm_pm_idle 2012-01-20 18:55:15 -05:00
io.c msm: Support DEBUG_LL on MSM8660 and MSM8960 2011-11-10 10:17:06 -08:00
irq-vic.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
last_radio_log.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
platsmp.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
proc_comm.c arm: msm: smd: fix SMD modem processor sync condition 2010-05-12 09:19:33 -07:00
proc_comm.h arm: msm: smd: fix SMD modem processor sync condition 2010-05-12 09:19:33 -07:00
scm-boot.c msm: scm-boot: Support for setting cold/warm boot addresses 2011-01-07 15:54:43 -08:00
scm-boot.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
scm.c ARM: msm: fix compilation flags for MSM_SCM 2011-11-08 08:58:28 -08:00
scm.h msm: Use explicit GPLv2 licenses 2011-02-28 12:40:05 -08:00
sirc.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
smd.c msm: smd: Reduce driver log chatter 2010-11-16 12:23:56 -08:00
smd_debug.c switch debugfs to umode_t 2012-01-03 22:54:56 -05:00
smd_private.h arm: msm: smd: msm7x30 a2m clean up 2010-05-12 09:19:04 -07:00
timer.c msm: timer: Use clockevents_config_and_register() 2011-11-10 10:36:34 -08:00
vreg.c ARM: msm: vreg is a module and so needs module.h 2012-01-06 11:07:57 -08:00