Maxime Ripard 31f8ad387e ARM: sun7i: a20: Add support for the High Speed Timers ... The Allwinner A20 has support for four high speed timers. Apart for the number of timers (4 vs 2), it's basically the same logic than the high speed timers found in the sun5i chips. Now that we have a driver to support it, we can enable them in the device tree. [dlezcano] : Fixed conflict with 428abbb8 "Enable the I2C controllers" Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>		2013-12-11 11:40:01 +01:00
..
alpha	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha	2013-11-20 15:03:45 -08:00
arc	Final set of ARC changes for 3.13-rc1	2013-11-19 11:44:15 -08:00
arm	ARM: sun7i: a20: Add support for the High Speed Timers	2013-12-11 11:40:01 +01:00
arm64	arm64: Move PTE_PROT_NONE higher up	2013-11-29 15:22:59 +00:00
avr32	avr32: uapi: be sure of "_UAPI" prefix for all guard macros	2013-11-20 09:53:22 +01:00
blackfin	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
c6x	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
cris	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
frv	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
hexagon	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-11-20 14:25:39 -08:00
m32r	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
m68k	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
metag	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
microblaze	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
mips	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
mn10300	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
openrisc	OpenRISC updates for 3.13	2013-11-15 14:26:38 -08:00
parisc	parisc: size_t is unsigned, so comparison size < 0 doesn't make sense.	2013-11-20 00:09:42 +01:00
powerpc	arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow	2013-11-25 11:50:57 +11:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2013-11-29 09:56:15 -08:00
score	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
sh	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2013-11-19 15:50:03 -08:00
tile	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
um	um: Build always with -mcmodel=large on 64bit	2013-12-01 13:06:51 +01:00
unicore32	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
x86	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-12-02 10:13:09 -08:00
xtensa	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-19 10:40:00 -08:00
.gitignore	…
Kconfig	kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS	2013-11-15 09:32:22 +09:00