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)
commit7f585bbfc54fec9dcf387fd2edb2d6f4908badf8
treefd79064e390217a56f77c5cd8236c0db6f8d9528
parent43231b5be657fde1c4ced180d829bbd59ceef9ad
parent4615943cf3a531bc76f589c22bd366da092b7c0f
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