TOI: Apply tuxonice-3.2-for-2.6.38 3/3 (resolve conflicts)
authorKan-Ru Chen <kanru@0xlab.org>
Wed, 1 Jun 2011 09:38:49 +0000 (17:38 +0800)
committerKan-Ru Chen <kanru@0xlab.org>
Wed, 1 Jun 2011 10:19:39 +0000 (18:19 +0800)
commitdb0e6fbb9cbb6883a5217f564b5d152d01141d01
tree6d6ebb13627c17daf03a9937b859902fca9e326d
parent571e83fa8654a08710a2545139334c147a2aa8ba
TOI: Apply tuxonice-3.2-for-2.6.38 3/3 (resolve conflicts)
include/linux/mm.h
include/linux/swap.h
kernel/power/process.c
kernel/printk.c
mm/ashmem.c
mm/swapfile.c