黄涛 fcef60e36f LSK v3.10 Android 14.07 release ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJT2ljqAAoJELSic+t+oim9DKAP+wYv7CYRRQzgQaqpTa2uBJi1 xjEbS3qz/yWl+xw+Svd9JUGcm4SQg1rvYBd3uEHuqAxqrwaM5BbCHozCiM5ZWRJV Q0bR7Ha6RcVXAmNmrs2NaUC7zxIcS1LiBN9FxLPlsv44pxBxgIzQI4ZjN2SMEx5u COz3uW+xeVJHMRQ+BYwB/L+NNkgVZdFb71EUrxDiXJr1GWBuhOQ2aYGMRw55QXt5 WoXUtAWGAQYWfUF6hBvpxEzB060ikOyBGxIdDQkeJdkNK3lD/Ql7M/FMii+H9njt FCGtIfV7j/aSzGDY2bW2yGart8N5AvP4T7rAU46+x2Cc9IwTigS8pYltdPv/YrF7 VYEG4MR2JcYlXl1pCdRHikAOID2tCZS81mhdBFgvXCqSy4OanBOajmu8BGGORFD2 RFUxALE0Cd+ZQ2JrGhLX+jvUC23FJNoHkcFGn0iE5nv5UJbC9XM7Do1XOe6EDb1r waOzjJD06OSAq8kDjExhjzDBhWuDWLdwo6/djsduo0FhI7XmmUs+ebeUne6OTuq5 duUMXBt48Y4UMbI9v9aSRJVA4OBLfmIlu8ZU8N13BqoN3O4BcWkziUepngc0B+AI 0ukzozgUjdmuvfmAKsA5OGwpJROtOx2NshsgSDVeFSaOWuqdM3dEE89paruT1qFX 5NVLVS2Ptn1HuBwHDnW3 =uFcV -----END PGP SIGNATURE----- Merge tag 'lsk-v3.10-android-14.07' into develop-3.10 LSK v3.10 Android 14.07 release Conflicts: drivers/clocksource/arm_arch_timer.c lib/Makefile		2014-08-06 15:34:14 +08:00
..
acpi_pm.c	Drivers: clocksource: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
arm_arch_timer.c	LSK v3.10 Android 14.07 release	2014-08-06 15:34:14 +08:00
bcm_kona_timer.c	ARM: bcm281xx: Add timer driver (driver portion)	2013-03-28 10:58:55 -07:00
bcm2835_timer.c	clocksource: pass DT node pointer to init functions	2013-03-11 08:42:07 -05:00
cadence_ttc_timer.c	arm: zynq: Move timer to generic location	2013-04-04 09:22:09 +02:00
clksrc-dbx500-prcmu.c	ARM: ux500: make remaining headers local	2013-04-08 13:59:48 +02:00
clksrc-of.c	clocksource: make CLOCKSOURCE_OF_DECLARE type safe	2013-03-28 12:01:06 +01:00
cs5535-clockevt.c	clocksource: use clockevents_config_and_register() where possible	2013-01-14 10:12:42 -08:00
cyclone.c	clocksource: cyclone: Add missing iounmap	2012-01-26 19:30:40 -08:00
dw_apb_timer_of.c	clocksource: dw_apb_timer_of: Fix read_sched_clock	2014-01-09 12:24:24 -08:00
dw_apb_timer.c
em_sti.c	clocksource: em_sti: Set cpu_possible_mask to fix SMP broadcast	2014-01-15 15:28:45 -08:00
exynos_mct.c	clocksource: Exynos_mct: Register clock event after request_irq()	2014-06-07 13:25:29 -07:00
i8253.c	time: Kill xtime_lock, replacing it with jiffies_lock	2012-11-13 14:08:23 -05:00
Kconfig	drivers: clocksource: add support for ARM architected timer event stream	2014-04-28 13:59:00 +08:00
Makefile	rk3188: add initial support	2013-11-22 19:24:41 +08:00
metag_generic.c	metag: Time keeping	2013-03-02 20:09:22 +00:00
mmio.c
mxs_timer.c	clocksource: mxs_timer: Add semicolon at end of line	2013-04-03 10:30:08 +08:00
nomadik-mtu.c	clocksource: nomadik-mtu: fix up clocksource/timer	2013-04-26 17:10:46 -07:00
rockchip_timer.c	clocksource: rockchip_timer: rk_timer_read_current_value64 return u64	2014-05-22 08:30:40 +08:00
samsung_pwm_timer.c	clocksource: samsung_pwm_timer: Work around rounding errors in clockevents core	2013-04-28 12:17:05 -07:00
scx200_hrt.c	clocksource: scx200_hrt: Fix the build	2012-02-22 13:25:16 +01:00
sh_cmt.c	clocksource: sh_cmt: Set initcall level to subsys	2013-03-13 02:24:36 +09:00
sh_mtu2.c	clocksource: sh_mtu2: Set initcall level to subsys	2013-03-13 02:24:37 +09:00
sh_tmu.c	clocksource: sh_tmu: Set initcall level to subsys	2013-03-13 02:24:36 +09:00
sun4i_timer.c	clocksource: sunxi: Rename sunxi to sun4i	2013-04-08 21:42:11 +02:00
tcb_clksrc.c	clocksource: use clockevents_config_and_register() where possible	2013-01-14 10:12:42 -08:00
tegra20_timer.c	Merge branch 'tegra/soc' into next/drivers	2013-04-09 17:07:36 +02:00
time-armada-370-xp.c	clocksource: time-armada-370-xp: add local timer support	2013-02-28 18:57:07 +01:00
timer-marco.c	ARM: sirf: use clocksource_of infrastructure	2013-03-25 12:29:41 +01:00
timer-prima2.c	ARM: sirf: use clocksource_of infrastructure	2013-03-25 12:29:41 +01:00
vt8500_timer.c	clocksource: make CLOCKSOURCE_OF_DECLARE type safe	2013-03-28 12:01:06 +01:00