Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
[linux-2.6] / arch / i386 / power /
drwxr-xr-x   ..
-rw-r--r-- 70 Makefile
-rw-r--r-- 3293 cpu.c
-rw-r--r-- 1456 swsusp.S