Merge branch 'dev-dt-timer' of github.com:jonhunter/linux into omap-for-v3.8/dt
authorTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 00:09:51 +0000 (16:09 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 00:09:51 +0000 (16:09 -0800)

Trivial merge