Merge branch 'uart'
authorTony Lindgren <tony@atomide.com>
Wed, 7 Mar 2012 00:59:04 +0000 (16:59 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Mar 2012 00:59:04 +0000 (16:59 -0800)

Trivial merge