tree a5d9f2ba40173182de56cae3628a5cb3eccfb6fa
parent 391c5111c9ce346edc3c3d8f907eb178a6decd16
author Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 1238253531 +0300
committer Eric Miao <eric.y.miao@gmail.com> 1244730022 +0800

[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>