tree 2311b6b4c12b946164e8cfb3422cebdfecf08f37
parent 71856843fb1d8ee455a4c1a60696c74afa4809e5
parent 6bb27d7349db51b50c40534710fe164ca0d58902
author Jon Hunter <jon-hunter@ti.com> 1364842049 -0500
committer Jon Hunter <jon-hunter@ti.com> 1364842049 -0500

Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10