From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Fri, 1 Oct 2010 20:24:10 +0000 (-0700)
Subject: manual merge for pm-hwmod-uart due to conflicts
X-Git-Tag: v2.6.37-rc1~121^2~25^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69758ab7a1e2de5636a2188d5357dd03140bf1d8;p=pandora-kernel.git

manual merge for pm-hwmod-uart due to conflicts
---

69758ab7a1e2de5636a2188d5357dd03140bf1d8
Reading git-diff-tree failed