黄涛 ee25a425b9 lsk 14.05 android release ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJThhtPAAoJELSic+t+oim9fZ4P/jAn9ODwGqk/EhH6GOzo98G7 mRvxwBvP+ZjR4sFeBt7opDKMfqnLul89K3MEXFriBrvlRrJD+cCPscosEOdxsdjH dtLYgIZa1xE4uACs+kSjWG5mwfKIcE9PPFw8LtPy17GBHDwVcVMYcXevy5capFMD eNydfhr4YdjzXsEXTygTLwj5PHEddSYWP8smUhEz9xfEC37UDdla4lxIIgkhHL4N Six9BivH+V1gm7TfiKYspCm1SCgWS4GessKNXSxBCvG0yyfFjfVBSI8fQnmCr3rJ ID5xWgFpLDaIFbEwsRwBkjsbJRrobTdYW4hI6h9y2TPBQVlyqm/sFjKxAfWRvm+N rqVHZWEpbShFPptCYPYt5m+Jz5nd0bN5Bp+uh7UOhNK0oPL9+Y+fJBhCfE9r8PtW qFbabDkClEUBdXuqQSoM0Iwo8do0k+WVk0wS2MKr4YW2iHT3GzT2+BC6mBhIJiES 1vjK6sN1HmzAGYTdmqzozTx+e7AHi2ibgpBlCp8WBtxjS4/cgc8Mbl+Gj5iIbj8f 7zgeOUKdUr/OpAx497wHA2vIHQ8N3+7+VJxnrt9QqtUICpInAKdTNW8Na5RNHKeU fd2fSsmAqjY85uCcanx2+XfJeUfKSoYXpz1xR4uTQEHggHCNoV/1zSni5Zg4bpc6 YfKEvDhP7JRzYt/H6U7p =vZ08 -----END PGP SIGNATURE----- Merge tag 'lsk-android-14.05' into develop-3.10 lsk 14.05 android release Conflicts: arch/arm/common/Kconfig arch/arm64/include/asm/arch_timer.h drivers/staging/android/fiq_debugger/fiq_debugger.c drivers/usb/Kconfig		2014-06-12 21:04:26 +08:00
..
acpi_pm.c	Drivers: clocksource: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
arm_arch_timer.c	lsk 14.05 android release	2014-06-12 21:04:26 +08:00
bcm2835_timer.c	clocksource: pass DT node pointer to init functions	2013-03-11 08:42:07 -05:00
bcm_kona_timer.c	ARM: bcm281xx: Add timer driver (driver portion)	2013-03-28 10:58:55 -07: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.c	dw_apb_timer: constify clocksource name	2011-10-04 13:08:18 -07:00
dw_apb_timer_of.c	clocksource: dw_apb_timer_of: Fix read_sched_clock	2014-01-09 12:24:24 -08:00
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	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -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-14 21:17:15 +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	clocksource: add common mmio clocksource	2011-05-23 18:04:51 +01:00
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