Merge branches 'fixes' and 'l3' into dt-base
authorTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 16:16:22 +0000 (09:16 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 16:16:22 +0000 (09:16 -0700)

Trivial merge