Merge branch 'pm-sleep'
[pandora-kernel.git] / kernel / power / snapshot.c
Simple merge