Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
authorJon Hunter <jon-hunter@ti.com>
Mon, 1 Apr 2013 18:47:29 +0000 (13:47 -0500)
committerJon Hunter <jon-hunter@ti.com>
Mon, 1 Apr 2013 18:47:29 +0000 (13:47 -0500)

Trivial merge