]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap...
authorTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:47:59 +0000 (10:47 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:47:59 +0000 (10:47 -0700)
commit23bc14239353f7e2107d8c7a9790f68ae6b0c2a0
treefd79064e390217a56f77c5cd8236c0db6f8d9528
parent1921243b6e5988e2b80ce8c11e70b12ad30dac47
parent6b233073b6352c5594dea76da930936f5b722948
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer

Conflicts:
arch/arm/mach-omap2/timer.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/timer.c