Merge branch 'fixes' into dt-base
authorTony Lindgren <tony@atomide.com>
Mon, 3 Oct 2011 23:38:16 +0000 (16:38 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 3 Oct 2011 23:38:16 +0000 (16:38 -0700)

Trivial merge