Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_ad...
authorPaul Walmsley <paul@pwsan.com>
Fri, 11 Mar 2011 05:41:28 +0000 (22:41 -0700)
committerPaul Walmsley <paul@pwsan.com>
Fri, 11 Mar 2011 05:41:28 +0000 (22:41 -0700)

Trivial merge