]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Revert "Merge branch 'stable/frontswap.v13' into linux-next"
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 16 Apr 2012 21:07:39 +0000 (17:07 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 16 Apr 2012 21:07:39 +0000 (17:07 -0400)
commita771aab64d3473eb06780a5800e1a5b4a5264c54
tree04e9f51835f4d5c08aada38597c30de1113c03d9
parent9c9fc31d65250b25459c83da739dccbc2c264038
Revert "Merge branch 'stable/frontswap.v13' into linux-next"

This reverts commit 80549e89d54a6f25b898112d58b2748d888460b1, reversing
changes made to 16c0cfa425b8e1488f7a1873bd112a7a099325f0.

Conflicts:

mm/swapfile.c
Documentation/vm/frontswap.txt [deleted file]
include/linux/frontswap.h [deleted file]
include/linux/swap.h
include/linux/swapfile.h [deleted file]
mm/Kconfig
mm/Makefile
mm/frontswap.c [deleted file]
mm/page_io.c
mm/swapfile.c