Merge branch 'devel-hwmod' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 20 Apr 2012 00:18:42 +0000 (17:18 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Apr 2012 00:18:42 +0000 (17:18 -0700)

Trivial merge