manual merge for pm-hwmod-uart due to conflicts
authorKevin Hilman <khilman@deeprootsystems.com>
Fri, 1 Oct 2010 20:24:10 +0000 (13:24 -0700)
committerKevin Hilman <khilman@deeprootsystems.com>
Fri, 1 Oct 2010 20:24:10 +0000 (13:24 -0700)

Trivial merge