]> 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)
commit4b51d9e4c7dbece4ab8d77706c2a3b9c9d945ef9
treefd79064e390217a56f77c5cd8236c0db6f8d9528
parent3a0b1d4a63ba8caafc2c8ec69457bb9b68c6fc42
parentaa778864b21bdeb1f94a2effc2fdc5c3cfb8ffd9
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