Tony Lindgren 43231b5be6 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>.

2013-04-03 10:32:47 -07:00

19 KiB

Raw Blame History

View Raw