Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
[linux-2.6] / arch / x86 / power /
drwxr-xr-x   ..
-rw-r--r-- 308 Makefile
-rw-r--r-- 3106 cpu_32.c
-rw-r--r-- 4705 cpu_64.c
-rw-r--r-- 4024 hibernate_32.c
-rw-r--r-- 4155 hibernate_64.c
-rw-r--r-- 1663 hibernate_asm_32.S
-rw-r--r-- 3878 hibernate_asm_64.S