manual merge for pm-hwmod-uart due to conflicts

This commit is contained in:
Kevin Hilman 2010-10-01 13:24:10 -07:00
commit 69758ab7a1
22 changed files with 2707 additions and 296 deletions