]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tmem/tmem'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 05:10:42 +0000 (16:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 05:10:42 +0000 (16:10 +1100)
commit9b3d51b4bbe124f2734e5ff66224440b6c98a3d4
tree937f6984e687186cee46bf30f2563bbd33265c94
parent7f4872378af28a63ad4049b23658259e17839b2e
parent665c1e6acbfb4c3b1476a299e383e68c54867cca
Merge remote-tracking branch 'tmem/tmem'

Conflicts:
mm/swapfile.c
drivers/staging/zcache/zcache-main.c
fs/buffer.c
fs/super.c
include/linux/swap.h
mm/Kconfig
mm/Makefile
mm/filemap.c
mm/swapfile.c
mm/truncate.c