tree c20d5c79e63533abf71ab8f89598eb777e9bee2b
parent 105612489bf59386b46b3f9f034e03f70e57aee6
parent 71856843fb1d8ee455a4c1a60696c74afa4809e5
author Tony Lindgren <tony@atomide.com> 1365010367 -0700
committer Tony Lindgren <tony@atomide.com> 1365010367 -0700

Merge commit '7185684' into omap-for-v3.10/timer

Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.