Merge branch 'hwmod-part2' into hwmod
authorTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:29:44 +0000 (05:29 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:29:44 +0000 (05:29 -0800)

Trivial merge