tree fd79064e390217a56f77c5cd8236c0db6f8d9528
parent 43231b5be657fde1c4ced180d829bbd59ceef9ad
parent 4615943cf3a531bc76f589c22bd366da092b7c0f
author Tony Lindgren <tony@atomide.com> 1365011279 -0700
committer Tony Lindgren <tony@atomide.com> 1365011279 -0700

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