Merge remote-tracking branch 'tmem/linux-next'
commit91889d096491f41c16bc844397ce6bc633dfd461
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:38:03 +0000 (23 14:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:38:03 +0000 (23 14:38 +1000)
treec5bde064d214357e8cdd5700025ffc27dfee7aec
parentbdea99561a0e1f532e89db9aea7590528d2b8806
parent4cc79b3c0519fa50270c72be2ce480c59669eba8
Merge remote-tracking branch 'tmem/linux-next'
include/linux/swap.h
mm/Kconfig
mm/swapfile.c