From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Sat, 28 Mar 2009 15:18:51 +0000 (+0300)
Subject: [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
X-Git-Tag: v2.6.31-rc1~344^2~3^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78731d33c1868f4ba43bafcca8dcaf938872c1f2;p=pandora-kernel.git

[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific

collie_pm was the only non-PXA user of sharpsl_pm. Now as it's gone we
can merge code into one single file to allow further cleanup.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
---

Reading git-diff-tree failed