Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[pandora-kernel.git] / mm / swap_state.c
diff --cc mm/swap_state.c
Simple merge